Make call instruction work correctly. The old code generated a legal short

form for it (opcode length 1, opcode 0, rather than opcode length 0).

svn path=/trunk/yasm/; revision=520

diff --git a/modules/arch/x86/instrs.dat b/modules/arch/x86/instrs.dat
index 1b1c8ed6fa7213009923d22755b097569d5afb54..7a04609483cf66c0f5b2708d9b2de2f9443bee17 100644 (file)
--- a/modules/arch/x86/instrs.dat
+++ b/modules/arch/x86/instrs.dat
@@ -429,18 +429,18 @@ shrd!shlrd                AC
 ; Special format for relative targets:
 ; !Grp/Inst    target          AdSize  ShrtOp  NearOp          ShrtCPU NearCPU
 ;
-!jmpcall       target          nil     $0.1    $0.2            8086    8086
-!jmpcall       imm:imm         nil     $0.3            $2i,nil         $1,16   8086
-!jmpcall       WORD imm:imm    16      $0.3            $2i,16          $1,16   8086
-!jmpcall       DWORD imm:imm   32      $0.3            $2i,32          $1,16   386
+!jmpcall       target          nil     $0.1?$0.2       $0.3    8086    8086
+!jmpcall       imm:imm         nil     $0.4            $2i,nil         $1,16   8086
+!jmpcall       WORD imm:imm    16      $0.4            $2i,16          $1,16   8086
+!jmpcall       DWORD imm:imm   32      $0.4            $2i,32          $1,16   386
 !jmpcall       memfar          nil     FF              $1,$0.4+1       nil     8086
 !jmpcall       WORD memfar     16      FF              $1,$0.4+1       nil     8086
 !jmpcall       DWORD memfar    32      FF              $1,$0.4+1       nil     386
 !jmpcall       mem             nil     FF              $1,$0.4         nil     8086
 !jmpcall       rm16x           16      FF              $1,$0.4         nil     8086
 !jmpcall       rm32x           32      FF              $1,$0.4         nil     386
-call!jmpcall           nil,E8,9A,2
-jmp!jmpcall            EB,E9,EA,4
+call!jmpcall           nil,0,E8,9A,2
+jmp!jmpcall            1,EB,E9,EA,4
 ret!onebyte            nil,C3          8086
 retn   nil                     nil     C3              nil             nil     8086
 retf   nil                     nil     CB              nil             nil     8086

diff --git a/src/arch/x86/instrs.dat b/src/arch/x86/instrs.dat
index 1b1c8ed6fa7213009923d22755b097569d5afb54..7a04609483cf66c0f5b2708d9b2de2f9443bee17 100644 (file)
--- a/src/arch/x86/instrs.dat
+++ b/src/arch/x86/instrs.dat
@@ -429,18 +429,18 @@ shrd!shlrd                AC
 ; Special format for relative targets:
 ; !Grp/Inst    target          AdSize  ShrtOp  NearOp          ShrtCPU NearCPU
 ;
-!jmpcall       target          nil     $0.1    $0.2            8086    8086
-!jmpcall       imm:imm         nil     $0.3            $2i,nil         $1,16   8086
-!jmpcall       WORD imm:imm    16      $0.3            $2i,16          $1,16   8086
-!jmpcall       DWORD imm:imm   32      $0.3            $2i,32          $1,16   386
+!jmpcall       target          nil     $0.1?$0.2       $0.3    8086    8086
+!jmpcall       imm:imm         nil     $0.4            $2i,nil         $1,16   8086
+!jmpcall       WORD imm:imm    16      $0.4            $2i,16          $1,16   8086
+!jmpcall       DWORD imm:imm   32      $0.4            $2i,32          $1,16   386
 !jmpcall       memfar          nil     FF              $1,$0.4+1       nil     8086
 !jmpcall       WORD memfar     16      FF              $1,$0.4+1       nil     8086
 !jmpcall       DWORD memfar    32      FF              $1,$0.4+1       nil     386
 !jmpcall       mem             nil     FF              $1,$0.4         nil     8086
 !jmpcall       rm16x           16      FF              $1,$0.4         nil     8086
 !jmpcall       rm32x           32      FF              $1,$0.4         nil     386
-call!jmpcall           nil,E8,9A,2
-jmp!jmpcall            EB,E9,EA,4
+call!jmpcall           nil,0,E8,9A,2
+jmp!jmpcall            1,EB,E9,EA,4
 ret!onebyte            nil,C3          8086
 retn   nil                     nil     C3              nil             nil     8086
 retf   nil                     nil     CB              nil             nil     8086