4347

1 files changed, 116 insertions, 122 deletions

diff --git a/subx/016jump_relative.cc b/subx/016jump_relative.cc
index 8b8452bb..2d3bbb2b 100644
--- a/subx/016jump_relative.cc
+++ b/subx/016jump_relative.cc
@@ -1,47 +1,41 @@
-//: jump to 16-bit offset
+//: jump to 8-bit offset
 
 //:: jump
 
-:(scenario jump_rel16)
+:(scenario jump_rel8)
 # op  ModR/M  SIB   displacement  immediate
-  e9                05 00                     # skip 1 instruction
+  eb                05                        # skip 1 instruction
   05                              00 00 00 01
   05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x00000009
++run: inst: 0x00000008
 -run: inst: 0x00000003
 
 :(before "End Single-Byte Opcodes")
-case 0xe9: {  // jump rel8
-  int16_t offset = imm16();
-  trace(2, "run") << "jump " << offset << end();
+case 0xeb: {  // jump rel8
+  int8_t offset = static_cast<int>(next());
+  trace(2, "run") << "jump " << NUM(offset) << end();
   EIP += offset;
   break;
 }
-:(code)
-int16_t imm16() {
-  int16_t result = next();
-  result |= (next()<<8);
-  return result;
-}
 
 //:: jump if equal/zero
 
-:(scenario je_rel16_success)
+:(scenario je_rel8_success)
 % ZF = true;
-# op      ModR/M  SIB   displacement  immediate
-  0f 84                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  74                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x84: {  // jump rel16 if ZF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x74: {  // jump rel8 if ZF
+  int8_t offset = static_cast<int>(next());
   if (ZF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -49,33 +43,33 @@ case 0x84: {  // jump rel16 if ZF
   break;
 }
 
-:(scenario je_rel16_fail)
+:(scenario je_rel8_fail)
 % ZF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 84                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  74                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5
 
 //:: jump if not equal/not zero
 
-:(scenario jne_rel16_success)
+:(scenario jne_rel8_success)
 % ZF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 85                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  75                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x85: {  // jump rel16 unless ZF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x75: {  // jump rel8 unless ZF
+  int8_t offset = static_cast<int>(next());
   if (!ZF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -83,35 +77,35 @@ case 0x85: {  // jump rel16 unless ZF
   break;
 }
 
-:(scenario jne_rel16_fail)
+:(scenario jne_rel8_fail)
 % ZF = true;
-# op      ModR/M  SIB   displacement  immediate
-  0f 85                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  75                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5
 
 //:: jump if greater
 
-:(scenario jg_rel16_success)
+:(scenario jg_rel8_success)
 % ZF = false;
 % SF = false;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8f                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7f                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x8f: {  // jump rel16 if !SF and !ZF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x7f: {  // jump rel8 if !SF and !ZF
+  int8_t offset = static_cast<int>(next());
   if (!ZF && SF == OF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -119,36 +113,36 @@ case 0x8f: {  // jump rel16 if !SF and !ZF
   break;
 }
 
-:(scenario jg_rel16_fail)
+:(scenario jg_rel8_fail)
 % ZF = false;
 % SF = true;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8f                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7f                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5
 
 //:: jump if greater or equal
 
-:(scenario jge_rel16_success)
+:(scenario jge_rel8_success)
 % SF = false;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8d                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7d                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x8d: {  // jump rel16 if !SF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x7d: {  // jump rel8 if !SF
+  int8_t offset = static_cast<int>(next());
   if (SF == OF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -156,36 +150,36 @@ case 0x8d: {  // jump rel16 if !SF
   break;
 }
 
-:(scenario jge_rel16_fail)
+:(scenario jge_rel8_fail)
 % SF = true;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8d                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7d                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5
 
 //:: jump if lesser
 
-:(scenario jl_rel16_success)
+:(scenario jl_rel8_success)
 % ZF = false;
 % SF = true;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8c                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7c                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x8c: {  // jump rel16 if SF and !ZF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x7c: {  // jump rel8 if SF and !ZF
+  int8_t offset = static_cast<int>(next());
   if (SF != OF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -193,50 +187,50 @@ case 0x8c: {  // jump rel16 if SF and !ZF
   break;
 }
 
-:(scenario jl_rel16_fail)
+:(scenario jl_rel8_fail)
 % ZF = false;
 % SF = false;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8c                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7c                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5
 
 //:: jump if lesser or equal
 
-:(scenario jle_rel16_equal)
+:(scenario jle_rel8_equal)
 % ZF = true;
 % SF = false;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8e                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7e                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(scenario jle_rel16_lesser)
+:(scenario jle_rel8_lesser)
 % ZF = false;
 % SF = true;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8e                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7e                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
 +run: jump 5
-+run: inst: 0x0000000a
--run: inst: 0x00000005
++run: inst: 0x00000008
+-run: inst: 0x00000003
 
-:(before "End Two-Byte Opcodes Starting With 0f")
-case 0x8e: {  // jump rel16 if SF or ZF
-  int8_t offset = imm16();
+:(before "End Single-Byte Opcodes")
+case 0x7e: {  // jump rel8 if SF or ZF
+  int8_t offset = static_cast<int>(next());
   if (ZF || SF != OF) {
     trace(2, "run") << "jump " << NUM(offset) << end();
     EIP += offset;
@@ -244,15 +238,15 @@ case 0x8e: {  // jump rel16 if SF or ZF
   break;
 }
 
-:(scenario jle_rel16_greater)
+:(scenario jle_rel8_greater)
 % ZF = false;
 % SF = false;
 % OF = false;
-# op      ModR/M  SIB   displacement  immediate
-  0f 8e                 05 00                     # skip 1 instruction
-  05                                  00 00 00 01
-  05                                  00 00 00 02
+# op  ModR/M  SIB   displacement  immediate
+  7e                05                        # skip 1 instruction
+  05                              00 00 00 01
+  05                              00 00 00 02
 +run: inst: 0x00000001
-+run: inst: 0x00000005
-+run: inst: 0x0000000a
++run: inst: 0x00000003
++run: inst: 0x00000008
 -run: jump 5