Place #ifdef's around MSVC #pragma's
Rewrite some signed/unsigned unions to use casts. Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@956
This commit is contained in:
parent
d8eae49c04
commit
4916b5fb6c
10 changed files with 55 additions and 21 deletions
|
@ -162,14 +162,14 @@ switch (Fetchb()) {
|
|||
case 0xbe: /* MOVSX Gd,Eb */
|
||||
{
|
||||
GetRMrd;
|
||||
if (rm >= 0xc0 ) {GetEArb;*rmrd=*earbs;}
|
||||
if (rm >= 0xc0 ) {GetEArb;*rmrd=*(Bit8s *)earb;}
|
||||
else {GetEAa;*rmrd=LoadMbs(eaa);}
|
||||
break;
|
||||
}
|
||||
case 0xbf: /* MOVSX Gd,Ew */
|
||||
{
|
||||
GetRMrd;
|
||||
if (rm >= 0xc0 ) {GetEArw;*rmrd=*earws;}
|
||||
if (rm >= 0xc0 ) {GetEArw;*rmrd=*(Bit16s *)earw;}
|
||||
else {GetEAa;*rmrd=LoadMws(eaa);}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -381,7 +381,7 @@ switch(Fetchb()) {
|
|||
case 0xbe: /* MOVSX Gw,Eb */
|
||||
{
|
||||
GetRMrw;
|
||||
if (rm >= 0xc0 ) {GetEArb;*rmrw=*earbs;}
|
||||
if (rm >= 0xc0 ) {GetEArb;*rmrw=*(Bit8s *)earb;}
|
||||
else {GetEAa;*rmrw=LoadMbs(eaa);}
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -53,24 +53,12 @@ extern Bit32u * lookupRMEAregd[256];
|
|||
|
||||
|
||||
#define GetEArb \
|
||||
union { \
|
||||
Bit8u * earb; \
|
||||
Bit8s * earbs; \
|
||||
}; \
|
||||
earb=lookupRMEAregb[rm];
|
||||
Bit8u * earb=lookupRMEAregb[rm];
|
||||
|
||||
#define GetEArw \
|
||||
union { \
|
||||
Bit16u * earw; \
|
||||
Bit16s * earws; \
|
||||
}; \
|
||||
earw=lookupRMEAregw[rm];
|
||||
Bit16u * earw=lookupRMEAregw[rm];
|
||||
|
||||
#define GetEArd \
|
||||
union { \
|
||||
Bit32u * eard; \
|
||||
Bit32s * eards; \
|
||||
}; \
|
||||
eard=lookupRMEAregd[rm];
|
||||
Bit32u * eard=lookupRMEAregd[rm];
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue