ed/WATL_Exercise
1
0
Fork 0
mirror of https://github.com/Ed94/WATL_Exercise.git synced 2025-08-04 22:32:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

watl.v0.win32.odin runtime works!

Browse Source
This commit is contained in:
Edward R. Gonzalez
2025-07-29 23:53:56 -04:00
parent f00b647227
commit fd045fa9d9
5 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -4,3 +4,4 @@ build
C/watl.v0.msvc.c.listing.txt C/watl.v0.msvc.c.listing.txt
watl_exercise.user watl_exercise.user
watl_exercise.proj watl_exercise.proj
Odin/watl.v0.win32.odin.listing.txt

12
C/watl.v0.msvc.c
View File

@@ -1036,8 +1036,8 @@ void os_init(void) {
inline Byte* os__vmem_reserve(SSIZE size, Opts_vmem* opts) { inline Byte* os__vmem_reserve(SSIZE size, Opts_vmem* opts) {
assert(opts != nullptr); assert(opts != nullptr);
void* result = VirtualAlloc(cast(void*, opts->base_addr), size void* result = VirtualAlloc(cast(void*, opts->base_addr), size
, MS_MEM_RESERVE|MS_MEM_COMMIT , MS_MEM_RESERVE
// |(opts->no_large_pages == false ? MS_MEM_LARGE_PAGES : 0) // |MS_MEM_COMMIT|(opts->no_large_pages == false ? MS_MEM_LARGE_PAGES : 0)
, MS_PAGE_READWRITE , MS_PAGE_READWRITE
); );
return result; return result;
@@ -2017,7 +2017,7 @@ void api_watl_lex(WATL_LexInfo* info, Str8 source, Opts_watl_lex* opts)
case WATL_Tok_Tab: case WATL_Tok_Tab:
{ {
if (* prev != * cursor) { if (* prev != * cursor) {
WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok) { goto slice_constraint_fail; } WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok && tok != nullptr) { goto slice_constraint_fail; }
tok = new_tok; tok = new_tok;
* tok = (WATL_Tok){ cursor, 0 }; * tok = (WATL_Tok){ cursor, 0 };
was_formatting = true; was_formatting = true;
@@ -2028,7 +2028,7 @@ void api_watl_lex(WATL_LexInfo* info, Str8 source, Opts_watl_lex* opts)
} }
break; break;
case WATL_Tok_LineFeed: { case WATL_Tok_LineFeed: {
WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok) { goto slice_constraint_fail; } WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok && tok != nullptr) { goto slice_constraint_fail; }
tok = new_tok; tok = new_tok;
* tok = (WATL_Tok){ cursor, 1 }; * tok = (WATL_Tok){ cursor, 1 };
cursor += 1; cursor += 1;
@@ -2038,7 +2038,7 @@ void api_watl_lex(WATL_LexInfo* info, Str8 source, Opts_watl_lex* opts)
break; break;
// Assuming what comes after is line feed. // Assuming what comes after is line feed.
case WATL_Tok_CarriageReturn: { case WATL_Tok_CarriageReturn: {
WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok) { goto slice_constraint_fail; } WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok && tok != nullptr) { goto slice_constraint_fail; }
tok = new_tok; tok = new_tok;
* tok = (WATL_Tok){ cursor, 2 }; * tok = (WATL_Tok){ cursor, 2 };
cursor += 2; cursor += 2;
@@ -2049,7 +2049,7 @@ void api_watl_lex(WATL_LexInfo* info, Str8 source, Opts_watl_lex* opts)
default: default:
{ {
if (was_formatting) { if (was_formatting) {
WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok) { goto slice_constraint_fail; } WATL_Tok* new_tok = alloc_tok(); if (new_tok - 1 != tok && tok != nullptr) { goto slice_constraint_fail; }
tok = new_tok; tok = new_tok;
* tok = (WATL_Tok){ cursor, 0 }; * tok = (WATL_Tok){ cursor, 0 };
was_formatting = false; was_formatting = false;

54
Odin/watl.v0.win32.odin
View File

@@ -132,7 +132,7 @@ slice_assert :: #force_inline proc (s: $SliceType / []$Type) {
assert(len(s) > 0) assert(len(s) > 0)
assert(s != nil) assert(s != nil)
} }
slice_end :: #force_inline proc "contextless" (s : $SliceType / []$Type) -> ^Type { return & s[len(s) - 1] } slice_end :: #force_inline proc "contextless" (s : $SliceType / []$Type) -> ^Type { return & cursor(s)[len(s)] }
@(require_results) slice_to_bytes :: proc "contextless" (s: []$Type) -> []byte { return ([^]byte)(raw_data(s))[:len(s) * size_of(Type)] } @(require_results) slice_to_bytes :: proc "contextless" (s: []$Type) -> []byte { return ([^]byte)(raw_data(s))[:len(s) * size_of(Type)] }
@(require_results) slice_raw :: proc "contextless" (s: []$Type) -> SliceRaw(Type) { return transmute(SliceRaw(Type)) s } @(require_results) slice_raw :: proc "contextless" (s: []$Type) -> SliceRaw(Type) { return transmute(SliceRaw(Type)) s }
@@ -564,7 +564,8 @@ os_vmem_commit :: proc(vm: rawptr, size: int, no_large_pages: b32 = false) -> b3
} }
os_vmem_reserve :: proc(size: int, base_addr: int = 0, no_large_pages: b32 = false) -> rawptr { os_vmem_reserve :: proc(size: int, base_addr: int = 0, no_large_pages: b32 = false) -> rawptr {
result := VirtualAlloc(rawptr(uintptr(base_addr)), uintptr(size), result := VirtualAlloc(rawptr(uintptr(base_addr)), uintptr(size),
MS_MEM_RESERVE | MS_MEM_COMMIT, MS_MEM_RESERVE,
// MS_MEM_COMMIT
// | (no_large_pages ? 0 : MS_MEM_LARGE_PAGES), // Large pages disabled // | (no_large_pages ? 0 : MS_MEM_LARGE_PAGES), // Large pages disabled
MS_PAGE_READWRITE) MS_PAGE_READWRITE)
return result return result
@@ -1022,7 +1023,7 @@ kt1cx_init :: proc(info: KT1CX_Info, m: KT1CX_InfoMeta, result: ^KT1CX_Byte) {
assert(m.type_width > 0) assert(m.type_width > 0)
table_raw := transmute(SliceByte) mem_alloc(info.backing_table, m.table_size * m.cell_size) table_raw := transmute(SliceByte) mem_alloc(info.backing_table, m.table_size * m.cell_size)
slice_assert(transmute([]byte) table_raw) slice_assert(transmute([]byte) table_raw)
result.cell_pool = mem_alloc(info.backing_cells, m.cell_pool_size * m.cell_size) result.cell_pool = mem_alloc(info.backing_cells, m.cell_size * m.cell_pool_size)
slice_assert(result.cell_pool) slice_assert(result.cell_pool)
table_raw.len = m.table_size table_raw.len = m.table_size
result.table = transmute([]byte) table_raw result.table = transmute([]byte) table_raw
@@ -1050,6 +1051,7 @@ kt1cx_clear :: proc(kt: KT1CX_Byte, m: KT1CX_ByteMeta) {
} }
} }
kt1cx_slot_id :: proc(kt: KT1CX_Byte, key: u64, m: KT1CX_ByteMeta) -> u64 { kt1cx_slot_id :: proc(kt: KT1CX_Byte, key: u64, m: KT1CX_ByteMeta) -> u64 {
cell_size := m.cell_size // dummy value
hash_index := key % u64(len(kt.table)) hash_index := key % u64(len(kt.table))
return hash_index return hash_index
} }
@@ -1127,7 +1129,7 @@ kt1cx_assert :: proc(kt: $type / KT1CX) {
slice_assert(kt.cell_pool) slice_assert(kt.cell_pool)
slice_assert(kt.table) slice_assert(kt.table)
} }
kt1cx_byte :: proc(kt: $type / KT1CX) -> KT1CX_Byte { return { slice_to_bytes(kt.cell_pool), slice_to_bytes(kt.table) } } kt1cx_byte :: proc(kt: $type / KT1CX) -> KT1CX_Byte { return { slice_to_bytes(kt.cell_pool), slice( transmute([^]byte) cursor(kt.table), len(kt.table)) } }
//endregion Key Table 1-Layer Chained-Chunked-Cells (KT1CX) //endregion Key Table 1-Layer Chained-Chunked-Cells (KT1CX)
//region String Operations //region String Operations
@@ -1225,7 +1227,7 @@ str8_fmt_kt1l :: proc(ainfo: AllocatorInfo, _buffer: ^[]byte, table: []KT1L_Slot
{ {
// Forward until we hit the delimiter '<' or the template's contents are exhausted. // Forward until we hit the delimiter '<' or the template's contents are exhausted.
for ; curr_code != '<' && cursor_fmt != end(fmt_template); { for ; curr_code != '<' && cursor_fmt != end(fmt_template); {
cursor_buffer = cursor_fmt cursor_buffer[0] = cursor_fmt [0]
cursor_buffer = cursor_buffer[1:] cursor_buffer = cursor_buffer[1:]
cursor_fmt = cursor_fmt [1:] cursor_fmt = cursor_fmt [1:]
curr_code = cursor_fmt [0] curr_code = cursor_fmt [0]
@@ -1246,7 +1248,7 @@ str8_fmt_kt1l :: proc(ainfo: AllocatorInfo, _buffer: ^[]byte, table: []KT1L_Slot
} }
if fmt_overflow do continue if fmt_overflow do continue
// Hashing the potential token and cross checking it with our token table // Hashing the potential token and cross checking it with our token table
key : u64 = 0; hash64_djb8(& key, slice(cursor_fmt, potential_token_length)) key : u64 = 0; hash64_djb8(& key, slice(cursor_potential_token, potential_token_length))
value : ^string = nil value : ^string = nil
for & token in table for & token in table
{ {
@@ -1266,11 +1268,12 @@ str8_fmt_kt1l :: proc(ainfo: AllocatorInfo, _buffer: ^[]byte, table: []KT1L_Slot
left := len(value) left := len(value)
cursor_value := cursor(transmute([]u8) value^) cursor_value := cursor(transmute([]u8) value^)
for ; left > 0 && buffer_remaining > 0; { for ; left > 0 && buffer_remaining > 0; {
cursor_buffer = cursor_value cursor_buffer[0] = cursor_value [0]
cursor_buffer = cursor_buffer[1:] cursor_buffer = cursor_buffer[1:]
cursor_value = cursor_value [1:]
cursor_fmt = cursor_fmt [1:] cursor_fmt = cursor_fmt [1:]
buffer_remaining -= 1 buffer_remaining -= 1
left_fmt -= 1 left -= 1
} }
// Sync cursor format to after the processed token // Sync cursor format to after the processed token
cursor_fmt = cursor_potential_token[potential_token_length + 1:] cursor_fmt = cursor_potential_token[potential_token_length + 1:]
@@ -1278,7 +1281,7 @@ str8_fmt_kt1l :: proc(ainfo: AllocatorInfo, _buffer: ^[]byte, table: []KT1L_Slot
left_fmt -= potential_token_length + 2 // The 2 here are the '<' & '>' delimiters being omitted. left_fmt -= potential_token_length + 2 // The 2 here are the '<' & '>' delimiters being omitted.
continue continue
} }
cursor_buffer = cursor_fmt cursor_buffer[0] = cursor_fmt [0]
cursor_buffer = cursor_buffer[1:] cursor_buffer = cursor_buffer[1:]
cursor_fmt = cursor_fmt [1:] cursor_fmt = cursor_fmt [1:]
curr_code = cursor_fmt [0] curr_code = cursor_fmt [0]
@@ -1336,6 +1339,7 @@ str8cache_init :: proc(cache: ^Str8Cache, str_reserve, cell_reserve, tbl_backing
slot_key_offset = offset_of(KT1CX_Slot_Str8, key), slot_key_offset = offset_of(KT1CX_Slot_Str8, key),
cell_next_offset = offset_of(KT1CX_Cell_Str8, next), cell_next_offset = offset_of(KT1CX_Cell_Str8, next),
cell_depth = Str8Cache_CELL_DEPTH, cell_depth = Str8Cache_CELL_DEPTH,
cell_size = size_of(KT1CX_Cell_Str8),
type_width = size_of(string), type_width = size_of(string),
type = string type = string
} }
@@ -1415,7 +1419,7 @@ str8gen_init :: proc(gen: ^Str8Gen, ainfo: AllocatorInfo) {
gen.cap = Kilo * 4 gen.cap = Kilo * 4
} }
str8gen_make :: proc(ainfo: AllocatorInfo) -> Str8Gen { gen: Str8Gen; str8gen_init(& gen, ainfo); return gen } str8gen_make :: proc(ainfo: AllocatorInfo) -> Str8Gen { gen: Str8Gen; str8gen_init(& gen, ainfo); return gen }
str8gen_to_bytes :: proc(gen: Str8Gen) -> []byte { return transmute([]byte) SliceByte {data = gen.ptr, len = gen.len} } str8gen_to_bytes :: proc(gen: Str8Gen) -> []byte { return transmute([]byte) SliceByte {data = gen.ptr, len = gen.cap} }
str8_from_str8gen :: proc(gen: Str8Gen) -> string { return transmute(string) SliceByte {data = gen.ptr, len = gen.len} } str8_from_str8gen :: proc(gen: Str8Gen) -> string { return transmute(string) SliceByte {data = gen.ptr, len = gen.len} }
str8gen_append_str8 :: proc(gen: ^Str8Gen, str: string) { str8gen_append_str8 :: proc(gen: ^Str8Gen, str: string) {
@@ -1634,7 +1638,7 @@ api_watl_lex :: proc(info: ^WATL_LexInfo, source: string,
case .Space: fallthrough case .Space: fallthrough
case .Tab: case .Tab:
if prev[0] != src_cursor[0] { if prev[0] != src_cursor[0] {
new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok { new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok && tok != nil {
slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last); slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last);
return return
} }
@@ -1646,7 +1650,7 @@ api_watl_lex :: proc(info: ^WATL_LexInfo, source: string,
src_cursor = src_cursor[1:] src_cursor = src_cursor[1:]
tok.len += 1 tok.len += 1
case .Line_Feed: case .Line_Feed:
new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok { new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok && tok != nil{
slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last); slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last);
return return
} }
@@ -1656,7 +1660,7 @@ api_watl_lex :: proc(info: ^WATL_LexInfo, source: string,
was_formatting = true was_formatting = true
num += 1 num += 1
case .Carriage_Return: case .Carriage_Return:
new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok { new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok && tok != nil {
slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last); slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last);
return return
} }
@@ -1667,7 +1671,7 @@ api_watl_lex :: proc(info: ^WATL_LexInfo, source: string,
num += 1 num += 1
case: case:
if (was_formatting) { if (was_formatting) {
new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok { new_tok := alloc_tok(ainfo_toks); if cursor(new_tok)[-1:] != tok && tok != nil {
slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last); slice_constraint_fail(info, ainfo_msgs, new_tok, & msg_last);
return return
} }
@@ -1758,7 +1762,7 @@ api_watl_parse :: proc(info: ^WATL_ParseInfo, tokens: []WATL_Tok,
{ {
case .Carriage_Return: fallthrough case .Carriage_Return: fallthrough
case .Line_Feed: case .Line_Feed:
new_line := alloc_type(ainfo_lines, WATL_Line); if cursor(new_line ^)[-1:] != line.data { new_line := alloc_type(ainfo_lines, WATL_Line); if cursor(new_line)[-1:] != transmute(^[]string)line {
info.signal |= { .MemFail_SliceConstraintFail } info.signal |= { .MemFail_SliceConstraintFail }
msg := alloc_type(ainfo_msgs, WATL_ParseMsg) msg := alloc_type(ainfo_msgs, WATL_ParseMsg)
msg.content = "Line slice allocation was not contiguous" msg.content = "Line slice allocation was not contiguous"
@@ -1788,6 +1792,7 @@ api_watl_parse :: proc(info: ^WATL_ParseInfo, tokens: []WATL_Tok,
sll_queue_push_n(& info.msgs, & msg_last, & msg) sll_queue_push_n(& info.msgs, & msg_last, & msg)
return return
} }
curr = new_node
line.len += 1 line.len += 1
continue continue
} }
@@ -1801,12 +1806,12 @@ watl_parse_stack :: #force_inline proc(tokens: []WATL_Tok,
) -> (info: WATL_ParseInfo) ) -> (info: WATL_ParseInfo)
{ {
api_watl_parse(& info, api_watl_parse(& info,
tokens, tokens,
ainfo_msgs, ainfo_msgs,
ainfo_nodes, ainfo_nodes,
ainfo_lines, ainfo_lines,
str_cache, str_cache,
failon_slice_constraint_fail) failon_slice_constraint_fail)
return return
} }
watl_dump_listing :: proc(buffer: AllocatorInfo, lines: []WATL_Line) -> string { watl_dump_listing :: proc(buffer: AllocatorInfo, lines: []WATL_Line) -> string {
@@ -1835,6 +1840,7 @@ watl_dump_listing :: proc(buffer: AllocatorInfo, lines: []WATL_Line) -> string {
{ "chunk", chunk } { "chunk", chunk }
}) })
} }
farena_reset(& sarena)
} }
return str8_from_str8gen(result) return str8_from_str8gen(result)
} }
@@ -1847,8 +1853,8 @@ main :: proc()
// Note(Ed): Possible compiler bug, cannot resolve proc map with named arguments. // Note(Ed): Possible compiler bug, cannot resolve proc map with named arguments.
vm_file := varena_make(reserve_size = Giga * 4, flags = { .No_Large_Pages }) vm_file := varena_make(reserve_size = Giga * 4, flags = { .No_Large_Pages })
// file := file_read_contents("watl.v0.msvc.c", backing = ainfo(vm_file)) // file := file_read_contents("watl.v0.win32.odin", backing = ainfo(vm_file))
file := file_read_contents("watl.v0.msvc.c", ainfo(vm_file)) file := file_read_contents("watl.v0.win32.odin", ainfo(vm_file))
slice_assert(file.content) slice_assert(file.content)
a_msgs := arena_make() a_msgs := arena_make()
@@ -1890,6 +1896,6 @@ main :: proc()
arena_reset(a_msgs) arena_reset(a_msgs)
arena_reset(a_toks) arena_reset(a_toks)
listing := watl_dump_listing(ainfo(a_msgs), parse_res.lines) listing := watl_dump_listing(ainfo(a_msgs), parse_res.lines)
file_write_str8("watl.v0.odin.listing.txt", listing) file_write_str8("watl.v0.win32.odin.listing.txt", listing)
return return
} }

2
scripts/build.c.ps1
View File

@@ -172,7 +172,7 @@ if ($true) {
write-host write-host
} }
if ($true) { if ($false) {
write-host "Dumping Debug Info" write-host "Dumping Debug Info"
$rbin_out = '--out:' $rbin_out = '--out:'

5
scripts/build.odin.odin
View File

@@ -98,7 +98,7 @@ main :: proc() {
path_build := join_path(path_root, "build") path_build := join_path(path_root, "build")
path_odin_src := join_path(path_root, "Odin") path_odin_src := join_path(path_root, "Odin")
file_source := join_path(path_odin_src, "watl.v0.win32.odin") file_source := join_path(path_odin_src, "watl.v0.win32.odin")
file_exe := join_path(path_build, "watl.v0.exe") file_exe := join_path(path_build, "watl.v0.win32.odin.exe")
res, errs := build(path_build, { res, errs := build(path_build, {
exe_odin, exe_odin,
@@ -112,7 +112,8 @@ main :: proc() {
flag_microarch_zen5, flag_microarch_zen5,
flag_no_thread_checker, flag_no_thread_checker,
flag_show_timings, flag_show_timings,
flag_use_rad_link, // flag_use_rad_link,
flag_use_lld,
join_str(flag_subsystem, "console"), join_str(flag_subsystem, "console"),
}) })
fmt.println(res) fmt.println(res)