ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-30 11:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use unaligned_load for regex virtual machine

Browse Source 
This should hopefully avoid any issues with loading operands greater
than 8 bits on alignment-sensitive platforms.
This commit is contained in:
Feoramund
2024-07-24 16:27:20 -04:00
parent 042f6de478
commit ff492e615c
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/regex/compiler/debugging.odin
+8 -7
View File
@@ -1,5 +1,6 @@
package regex_compiler
import "base:intrinsics"
import "core:io"
import "core:text/regex/common"
import "core:text/regex/virtual_machine"
@@ -9,11 +10,11 @@ get_jump_targets :: proc(code: []Opcode) -> (jump_targets: map[int]int) {
for opcode, pc in virtual_machine.iterate_opcodes(&iter) {
#partial switch opcode {
case .Jump:
jmp := cast(int)(cast(^u16)&code[pc+1])^
jmp := cast(int)intrinsics.unaligned_load(cast(^u16)&code[pc+1])
jump_targets[jmp] = pc
case .Split:
jmp_x := cast(int)(cast(^u16)&code[pc+1])^
jmp_y := cast(int)(cast(^u16)&code[pc+3])^
jmp_x := cast(int)intrinsics.unaligned_load(cast(^u16)&code[pc+1])
jmp_y := cast(int)intrinsics.unaligned_load(cast(^u16)&code[pc+3])
jump_targets[jmp_x] = pc
jump_targets[jmp_y] = pc
}
@@ -46,18 +47,18 @@ trace :: proc(w: io.Writer, code: []Opcode) {
operand := cast(rune)code[pc+1]
io.write_encoded_rune(w, operand)
case .Rune:
operand := (cast(^rune)&code[pc+1])^
operand := intrinsics.unaligned_load(cast(^rune)&code[pc+1])
io.write_encoded_rune(w, operand)
case .Rune_Class, .Rune_Class_Negated:
operand := cast(u8)code[pc+1]
common.write_padded_hex(w, operand, 2)
case .Jump:
jmp := (cast(^u16)&code[pc+1])^
jmp := intrinsics.unaligned_load(cast(^u16)&code[pc+1])
io.write_string(w, "-> $")
common.write_padded_hex(w, jmp, 4)
case .Split:
jmp_x := (cast(^u16)&code[pc+1])^
jmp_y := (cast(^u16)&code[pc+3])^
jmp_x := intrinsics.unaligned_load(cast(^u16)&code[pc+1])
jmp_y := intrinsics.unaligned_load(cast(^u16)&code[pc+3])
io.write_string(w, "=> $")
common.write_padded_hex(w, jmp_x, 4)
io.write_string(w, ", $")