ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197 from bpunsky/context-bug-fix

Browse Source 
Context bug fix
This commit is contained in:
gingerBill
2018-02-25 00:13:02 +00:00
committed by GitHub
parent 35ba5771a5 564226be02
commit b74ae77745
4 changed files with 1088 additions and 1074 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem.odin
+4
View File
@@ -42,6 +42,10 @@ ptr_to_bytes :: proc "contextless" (ptr: ^$T, len := 1) -> []byte {
return transmute([]byte)raw.Slice{ptr, len*size_of(T)}; return transmute([]byte)raw.Slice{ptr, len*size_of(T)};
} }
any_to_bytes :: proc "contextless" (val: any) -> []byte {
return transmute([]byte)raw.Slice{val.data, val.type_info.size};
}
kilobytes :: inline proc "contextless" (x: int) -> int do return (x) * 1024; kilobytes :: inline proc "contextless" (x: int) -> int do return (x) * 1024;
megabytes :: inline proc "contextless" (x: int) -> int do return kilobytes(x) * 1024; megabytes :: inline proc "contextless" (x: int) -> int do return kilobytes(x) * 1024;
core/sys/windows.odin
+4
View File
@@ -626,6 +626,10 @@ foreign kernel32 {
@(link_name="HeapFree") heap_free :: proc(h: Handle, flags: u32, memory: rawptr) -> Bool ---; @(link_name="HeapFree") heap_free :: proc(h: Handle, flags: u32, memory: rawptr) -> Bool ---;
@(link_name="GetProcessHeap") get_process_heap :: proc() -> Handle ---; @(link_name="GetProcessHeap") get_process_heap :: proc() -> Handle ---;
@(link_name="LocalAlloc") local_alloc :: proc(flags: u32, bytes: int) -> rawptr ---;
@(link_name="LocalReAlloc") local_realloc :: proc(mem: rawptr, bytes: int, flags: uint) -> rawptr ---;
@(link_name="LocalFree") local_free :: proc(mem: rawptr) -> rawptr ---;
@(link_name="FindFirstChangeNotificationA") find_first_change_notification_a :: proc(path: ^byte, watch_subtree: Bool, filter: u32) -> Handle ---; @(link_name="FindFirstChangeNotificationA") find_first_change_notification_a :: proc(path: ^byte, watch_subtree: Bool, filter: u32) -> Handle ---;
@(link_name="FindNextChangeNotification") find_next_change_notification :: proc(h: Handle) -> Bool ---; @(link_name="FindNextChangeNotification") find_next_change_notification :: proc(h: Handle) -> Bool ---;
@(link_name="FindCloseChangeNotification") find_close_change_notification :: proc(h: Handle) -> Bool ---; @(link_name="FindCloseChangeNotification") find_close_change_notification :: proc(h: Handle) -> Bool ---;
shared/.gitkeep
View File
src/ir.cpp
+6
View File
@@ -1650,6 +1650,12 @@ irValue *ir_find_or_generate_context_ptr(irProcedure *proc) {
if (proc->context_stack.count > 0) { if (proc->context_stack.count > 0) {
return proc->context_stack[proc->context_stack.count-1]; return proc->context_stack[proc->context_stack.count-1];
} }
irBlock *tmp_block = proc->curr_block;
proc->curr_block = proc->blocks[0];
defer (proc->curr_block = tmp_block);
irValue *c = ir_add_local_generated(proc, t_context); irValue *c = ir_add_local_generated(proc, t_context);
array_add(&proc->context_stack, c); array_add(&proc->context_stack, c);
ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context)); ir_emit_store(proc, c, ir_emit_load(proc, proc->module->global_default_context));