duskos

commit 2d9afa6fe128c80509527fa3a906bdec0a229c73
parent 518096c94478edb1076627eaf8d71907828a83bf
Author: Virgil Dupras <hsoft@hardcoded.net>
Date:   Sat,  1 Jul 2023 08:38:00 -0400

hal i386: consolidate

Diffstat:
M
fs/xcomp/i386/kernel.fs
 | 
5
++---

1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/xcomp/i386/kernel.fs b/fs/xcomp/i386/kernel.fs
@@ -177,6 +177,8 @@ xcode A>) ( operand -- operand )
   ax $18 i) or, ret, \ dst=bx (3<<3)
 
 xcode &) ( operand -- operand )
+  dx ax mov, dl $c7 i) and, dl $05 i) cmp, forward8 jnz, \ is m)? make it i)
+    0 0 al modrm!, ax HALIMM i) or, ret, forward!
   ax HALDEREF i) or, ret,
 
 xcode <>) ( operand -- operand )
@@ -248,8 +250,6 @@ pc to lblmodrmwr ( operand -- )
 pc to lblderef ( operand -- operand )
   ax HALDEREF i) test, forward8 jnz, ret, forward!
   ax HALDEREF ^ i) and,
-  dx ax mov, dl $c7 i) and, dl $05 i) cmp, forward8 jnz, \ is m)? make it i)
-    0 0 al modrm!, ax HALIMM i) or, ret, forward!
   ax $c0 i) test, \ mod
   forward8 jnz, \ mod=0, set to mod=3
     ax $c0 i) or, ret, forward!
@@ -282,7 +282,6 @@ pc to L2 ( operand -- ) \ 16b or 8b, movzx
   $0f i) cwrite,
   ax $b600 i) or, lblregularwr absjmp,
 xcode @, ( operand -- ) \ ax operand mov,
-  lblderef abscall,
   ax HALIMM i) test, L3 abs>rel jnz,
   ax HALINV i) test, forward8 jnz, \ inverted? no movzx!
   ax HAL16B i) test, L2 abs>rel jnz,