From 9813a8708c2277df4e43de7b8a557b34fb2f1a56 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Sat, 10 Feb 2007 20:38:38 +0000 Subject: [PATCH] * fixed encoding of jcxz git-svn-id: trunk@6398 - --- compiler/i386/i386tab.inc | 4 ++-- compiler/x86/aasmcpu.pas | 2 +- compiler/x86/x86ins.dat | 4 ++-- compiler/x86_64/x8664tab.inc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/i386/i386tab.inc b/compiler/i386/i386tab.inc index c56cac36c8..54473957da 100644 --- a/compiler/i386/i386tab.inc +++ b/compiler/i386/i386tab.inc @@ -2517,14 +2517,14 @@ opcode : A_JCXZ; ops : 1; optypes : (ot_immediate,ot_none,ot_none); - code : #212#1#227#40; + code : #200#1#227#40; flags : if_8086 ), ( opcode : A_JECXZ; ops : 1; optypes : (ot_immediate,ot_none,ot_none); - code : #213#1#227#40; + code : #201#1#227#40; flags : if_386 ), ( diff --git a/compiler/x86/aasmcpu.pas b/compiler/x86/aasmcpu.pas index 9e2e3f0554..f55afef9d5 100644 --- a/compiler/x86/aasmcpu.pas +++ b/compiler/x86/aasmcpu.pas @@ -1749,6 +1749,7 @@ implementation {$endif x86_64} end; end; + 200, 212 : inc(len); 214 : @@ -1759,7 +1760,6 @@ implementation rex:=rex or $48; {$endif x86_64} end; - 200, 201, 202, 211, diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat index ca437aaed4..cd249ac8b5 100644 --- a/compiler/x86/x86ins.dat +++ b/compiler/x86/x86ins.dat @@ -855,11 +855,11 @@ void \324\1\xCF 8086 [JCXZ] (Ch_RECX, Ch_None, Ch_None) -imm \324\1\xE3\50 8086 +imm \310\1\xE3\50 8086 [JECXZ] (Ch_RECX, Ch_None, Ch_None) -imm \325\1\xE3\50 386 +imm \311\1\xE3\50 386 [JMP,jmpX] (Ch_ROp1, Ch_None, Ch_None) diff --git a/compiler/x86_64/x8664tab.inc b/compiler/x86_64/x8664tab.inc index d8f052bb56..1d2d4820bb 100644 --- a/compiler/x86_64/x8664tab.inc +++ b/compiler/x86_64/x8664tab.inc @@ -2503,7 +2503,7 @@ opcode : A_JCXZ; ops : 1; optypes : (ot_immediate,ot_none,ot_none); - code : #212#1#227#40; + code : #200#1#227#40; flags : if_8086 ), (