target-i386: Fix aflag logic for CODE64 and the 0x67 prefix
PATCH 1/1 target-i386: Fix aflag logic for CODE64 and the 0x67 prefix
The code reorganization in commit 4a6fd938 broke handling of PREFIX_ADR. While fixing this, tidy and comment the code so that it's more obvious what's going on in setting both aflag and dflag.
The TARGET_X86_64 ifdef can be eliminated because CODE64 expands to the constant zero when TARGET_X86_64 is undefined.
--- target-i386/translate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
target-i386/translate.c +15 -15
@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } s->pc = pc_start; prefixes =0 ; - aflag = s->code32; - dflag = s->code32; s->override =-1 ; rex_w =-1 ; rex_r =0 ;
@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, }/* Post-process prefixes. */ -if (prefixes &PREFIX_DATA ) { - dflag ^=1 ; - } -if (prefixes &PREFIX_ADR ) { - aflag ^=1 ; - } -#ifdef TARGET_X86_64 if (CODE64 (s)) { -if (rex_w ==1 ) { -/* 0x66 is ignored if rex.w is set */ - dflag =2 ; +/* In 64-bit mode, the default data size is 32-bit. Select 64-bit +data with rex_w, and 16-bit data with 0x66; rex_w takes precedence +over 0x66 if both are present. */ + dflag = (rex_w >0 ?2 : prefixes &PREFIX_DATA ?0 :1 ); +/* In 64-bit mode, 0x67 selects 32-bit addressing. */ + aflag = (prefixes &PREFIX_ADR ?1 :2 ); + }else { +/* In 16/32-bit mode, 0x66 selects the opposite data size. */ + dflag = s->code32; +if (prefixes &PREFIX_DATA ) { + dflag ^=1 ; } -if (!(prefixes &PREFIX_ADR )) { - aflag =2 ; +/* In 16/32-bit mode, 0x67 selects the opposite addressing. */ + aflag = s->code32; +if (prefixes &PREFIX_ADR ) { + aflag ^=1 ; } } -#endif s->prefix = prefixes; s->aflag = aflag;
Signature · 1 line
1.8.1.4
Ping.
Quoted 67 lines · Richard Henderson
The code reorganization in commit
4a6fd938broke handling ofPREFIX_ADR. While fixing this, tidy and comment the code so that it's more obvious what's going on in setting both aflag and dflag.The
TARGET_X86_64ifdef can be eliminated because CODE64 expands to the constant zero whenTARGET_X86_64is undefined.Cc Paolo Bonzini <[email protected]>Reported-by Laszlo Ersek <[email protected]>Signed-off-by Richard Henderson <[email protected]>--- target-i386/translate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)target-i386/translate.c +15
-15@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } s->pc = pc_start; prefixes =0 ; - aflag = s->code32; - dflag = s->code32; s->override =-1 ; rex_w =-1 ; rex_r =0 ;@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, }/* Post-process prefixes. */ -if (prefixes &PREFIX_DATA ) { - dflag ^=1 ; - } -if (prefixes &PREFIX_ADR ) { - aflag ^=1 ; - } -#ifdef TARGET_X86_64 if (CODE64 (s)) { -if (rex_w ==1 ) { -/* 0x66 is ignored if rex.w is set */ - dflag =2 ; +/* In 64-bit mode, the default data size is 32-bit. Select 64-bit +data with rex_w, and 16-bit data with 0x66; rex_w takes precedence +over 0x66 if both are present. */ + dflag = (rex_w >0 ?2 : prefixes &PREFIX_DATA ?0 :1 ); +/* In 64-bit mode, 0x67 selects 32-bit addressing. */ + aflag = (prefixes &PREFIX_ADR ?1 :2 ); + }else { +/* In 16/32-bit mode, 0x66 selects the opposite data size. */ + dflag = s->code32; +if (prefixes &PREFIX_DATA ) { + dflag ^=1 ; } -if (!(prefixes &PREFIX_ADR )) { - aflag =2 ; +/* In 16/32-bit mode, 0x67 selects the opposite addressing. */ + aflag = s->code32; +if (prefixes &PREFIX_ADR ) { + aflag ^=1 ; } } -#endif s->prefix = prefixes; s->aflag = aflag;
Paolo Bonzini
Reviewed-byIl 31/05/2013 17:03, Richard Henderson ha scritto:
Quoted 56 lines
Ping.
Quoted 53 lines · Richard Henderson
The code reorganization in commit
4a6fd938broke handling ofPREFIX_ADR. While fixing this, tidy and comment the code so that it's more obvious what's going on in setting both aflag and dflag.The
TARGET_X86_64ifdef can be eliminated because CODE64 expands to the constant zero whenTARGET_X86_64is undefined.Cc Paolo Bonzini <[email protected]>Reported-by Laszlo Ersek <[email protected]>Signed-off-by Richard Henderson <[email protected]>--- target-i386/translate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)target-i386/translate.c +11
-12@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } s->pc = pc_start; prefixes =0 ; - aflag = s->code32; - dflag = s->code32; s->override =-1 ; rex_w =-1 ; rex_r =0 ;@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, }/* Post-process prefixes. */ -if (prefixes &PREFIX_DATA ) { - dflag ^=1 ; - } -if (prefixes &PREFIX_ADR ) { - aflag ^=1 ; - } -#ifdef TARGET_X86_64 if (CODE64 (s)) { -if (rex_w ==1 ) { -/* 0x66 is ignored if rex.w is set */ - dflag =2 ; +/* In 64-bit mode, the default data size is 32-bit. Select 64-bit +data with rex_w, and 16-bit data with 0x66; rex_w takes precedence +over 0x66 if both are present. */ + dflag = (rex_w >0 ?2 : prefixes &PREFIX_DATA ?0 :1 ); +/* In 64-bit mode, 0x67 selects 32-bit addressing. */ + aflag = (prefixes &PREFIX_ADR ?1 :2 ); + }else { +/* In 16/32-bit mode, 0x66 selects the opposite data size. */ + dflag = s->code32; +if (prefixes &PREFIX_DATA ) { + dflag ^=1 ;
Quoted 8 lines
target-i386/translate.c static target_ulong disas_insn(CPUX86State *env, DisasContext *s, · line 4819
Quoted 8 lines
target-i386/translate.c +4
-2} -if (!(prefixes &PREFIX_ADR )) { - aflag =2 ; +/* In 16/32-bit mode, 0x67 selects the opposite addressing. */ + aflag = s->code32; +if (prefixes &PREFIX_ADR ) { + aflag ^=1 ; }
Quoted 7 lines
Quoted 6 lines
target-i386/translate.c +0
-1} -#endif s->prefix = prefixes; s->aflag = aflag;
Quoted 57 lines · Richard Henderson
The code reorganization in commit
4a6fd938broke handling ofPREFIX_ADR. While fixing this, tidy and comment the code so that it's more obvious what's going on in setting both aflag and dflag.The
TARGET_X86_64ifdef can be eliminated because CODE64 expands to the constant zero whenTARGET_X86_64is undefined.Cc Paolo Bonzini <[email protected]>Reported-by Laszlo Ersek <[email protected]>Signed-off-by Richard Henderson <[email protected]>--- target-i386/translate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)target-i386/translate.c +11
-14@@ -4677,8 +4677,6 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, } s->pc = pc_start; prefixes =0 ; - aflag = s->code32; - dflag = s->code32; s->override =-1 ; rex_w =-1 ; rex_r =0 ;@@ -4801,23 +4799,25 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, }/* Post-process prefixes. */ -if (prefixes &PREFIX_DATA ) { - dflag ^=1 ; - } -if (prefixes &PREFIX_ADR ) { - aflag ^=1 ; - } -#ifdef TARGET_X86_64 if (CODE64 (s)) { -if (rex_w ==1 ) { -/* 0x66 is ignored if rex.w is set */ - dflag =2 ; +/* In 64-bit mode, the default data size is 32-bit. Select 64-bit +data with rex_w, and 16-bit data with 0x66; rex_w takes precedence +over 0x66 if both are present. */ + dflag = (rex_w >0 ?2 : prefixes &PREFIX_DATA ?0 :1 ); +/* In 64-bit mode, 0x67 selects 32-bit addressing. */ + aflag = (prefixes &PREFIX_ADR ?1 :2 ); + }else { +/* In 16/32-bit mode, 0x66 selects the opposite data size. */ + dflag = s->code32; +if (prefixes &PREFIX_DATA ) { + dflag ^=1 ; } -if (!(prefixes &PREFIX_ADR )) { - aflag =2 ;
target-i386/translate.c static target_ulong disas_insn(CPUX86State *env, DisasContext *s, · line 4823
Quoted 10 lines
target-i386/translate.c +4
-1+/* In 16/32-bit mode, 0x67 selects the opposite addressing. */ + aflag = s->code32; +if (prefixes &PREFIX_ADR ) { + aflag ^=1 ; } } -#endif s->prefix = prefixes; s->aflag = aflag;
Anthony Liguori
AppliedApplied. Thanks.
Regards,
Anthony Liguori