Showing with 25 additions and 25 deletions.
  1. +1 −1 src/backend/backconfig.c
  2. +4 −4 src/backend/cdef.h
  3. +3 −3 src/backend/cgobj.c
  4. +6 −6 src/backend/cod2.c
  5. +2 −2 src/backend/cod3.c
  6. +1 −1 src/backend/elfobj.c
  7. +1 −1 src/backend/machobj.c
  8. +1 −1 src/backend/mscoffobj.c
  9. +1 −1 src/backend/nteh.c
  10. +5 −5 src/backend/out.c
2 changes: 1 addition & 1 deletion src/backend/backconfig.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void out_config_init(
}
else
{
config.exe = EX_NT;
config.exe = EX_WIN32;
config.ehmethod = EH_WIN32;
config.flags2 |= CFG2seh; // Win32 eh
config.objfmt = mscoff ? OBJ_MSCOFF : OBJ_OMF;
Expand Down
8 changes: 4 additions & 4 deletions src/backend/cdef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ One and only one of these macros must be set by the makefile:
#if __GNUC__
#define LDOUBLE 0 // no support for true long doubles
#else
#define LDOUBLE (config.exe == EX_NT) // support true long doubles
#define LDOUBLE (config.exe == EX_WIN32) // support true long doubles
#endif

#if _MSC_VER
Expand Down Expand Up @@ -497,7 +497,7 @@ typedef targ_uns targ_size_t; /* size_t for the target machine */
#define NEWTEMPMANGLE (!(config.flags4 & CFG4oldtmangle)) // do new template mangling
#define USEDLLSHELL _WINDLL
#define FARCLASSES 1 // support near/far classes
#define MFUNC (I32) //0 && config.exe == EX_NT) // member functions are TYmfunc
#define MFUNC (I32) //0 && config.exe == EX_WIN32) // member functions are TYmfunc
#define CV3 0 // 1 means support CV3 debug format

/* Object module format
Expand Down Expand Up @@ -697,7 +697,7 @@ struct Config
//#define EX_WIN16 0x20 // Windows 3.x 16 bit program
#define EX_OS2 0x40 // OS/2 2.0 32 bit program
#define EX_OS1 0x80 // OS/2 1.x 16 bit program
#define EX_NT 0x100 // NT
#define EX_WIN32 0x100
#define EX_MZ 0x200 // MSDOS real mode program
#define EX_XENIX 0x400
#define EX_SCOUNIX 0x800
Expand All @@ -714,7 +714,7 @@ struct Config
#define EX_OPENBSD 0x400000
#define EX_OPENBSD64 0x800000

#define EX_flat (EX_OS2 | EX_NT | EX_LINUX | EX_WIN64 | EX_LINUX64 | \
#define EX_flat (EX_OS2 | EX_WIN32 | EX_LINUX | EX_WIN64 | EX_LINUX64 | \
EX_OSX | EX_OSX64 | EX_FREEBSD | EX_FREEBSD64 | \
EX_OPENBSD | EX_OPENBSD64 | \
EX_SOLARIS | EX_SOLARIS64)
Expand Down
6 changes: 3 additions & 3 deletions src/backend/cgobj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,7 @@ STATIC void obj_defaultlib()
case EX_OS1:
library[1] = 'O';
break;
case EX_NT:
case EX_WIN32:
#if MARS
library[1] = 'M';
#else
Expand Down Expand Up @@ -1383,7 +1383,7 @@ STATIC void objheader(char *csegname)
comment[2] = config.target_cpu + '0';
comment[3] = model[config.memmodel];
if (I32)
{ if (config.exe == EX_NT)
{ if (config.exe == EX_WIN32)
comment[3] = 'n';
else if (config.exe == EX_OS2)
comment[3] = 'f';
Expand Down Expand Up @@ -2301,7 +2301,7 @@ size_t Obj::mangle(Symbol *s,char *dest)
#endif
case mTYman_std:
if (!(config.flags4 & CFG4oldstdmangle) &&
config.exe == EX_NT && tyfunc(s->ty()) &&
config.exe == EX_WIN32 && tyfunc(s->ty()) &&
!variadic(s->Stype))
{
dest[1] = '_';
Expand Down
12 changes: 6 additions & 6 deletions src/backend/cod2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5038,13 +5038,13 @@ code *cdinfo(elem *e,regm_t *pretregs)
c = cat(c,codelem(e->E1,&retregs,FALSE));
break;
case OPmark:
if (0 && config.exe == EX_NT)
if (0 && config.exe == EX_WIN32)
{ unsigned idx;

idx = except_index_get();
except_mark();
c = codelem(e->E2,pretregs,FALSE);
if (config.exe == EX_NT && idx != except_index_get())
if (config.exe == EX_WIN32 && idx != except_index_get())
{ usednteh |= NTEHcleanup;
c = cat(c,nteh_gensindex(idx - 1));
}
Expand Down Expand Up @@ -5082,7 +5082,7 @@ code *cddctor(elem *e,regm_t *pretregs)
MOV sindex[BP],index
*/
usednteh |= EHcleanup;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{ usednteh |= NTEHcleanup | NTEH_try;
nteh_usevars();
}
Expand Down Expand Up @@ -5120,7 +5120,7 @@ code *cdddtor(elem *e,regm_t *pretregs)
L1: NOP
*/
usednteh |= EHcleanup;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{ usednteh |= NTEHcleanup | NTEH_try;
nteh_usevars();
}
Expand Down Expand Up @@ -5185,7 +5185,7 @@ code *cdctor(elem *e,regm_t *pretregs)
code *c;

usednteh |= EHcleanup;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
usednteh |= NTEHcleanup;
assert(*pretregs == 0);
cs.Iop = ESCAPE | ESCctor;
Expand All @@ -5207,7 +5207,7 @@ code *cddtor(elem *e,regm_t *pretregs)
code *c;

usednteh |= EHcleanup;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
usednteh |= NTEHcleanup;
assert(*pretregs == 0);
cs.Iop = ESCAPE | ESCdtor;
Expand Down
4 changes: 2 additions & 2 deletions src/backend/cod3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3812,7 +3812,7 @@ void epilog(block *b)
useregs((ALLREGS | mBP | mES) & ~s->Sregsaved);
}

if (usednteh & ~NTEHjmonitor && (config.exe == EX_NT || MARS))
if (usednteh & ~NTEHjmonitor && (config.exe == EX_WIN32 || MARS))
c = cat(c,nteh_epilog());

cpopds = CNIL;
Expand Down Expand Up @@ -6029,7 +6029,7 @@ unsigned codout(code *c)
case ESCctor:
case ESCdtor:
case ESCoffset:
if (config.exe != EX_NT)
if (config.exe != EX_WIN32)
except_pair_setoffset(c,ggen.getOffset() - funcoffset);
break;
case ESCmark:
Expand Down
2 changes: 1 addition & 1 deletion src/backend/elfobj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@ char *obj_mangle2(Symbol *s,char *dest)
if (tyfunc(s->ty()) && !variadic(s->Stype))
#else
if (!(config.flags4 & CFG4oldstdmangle) &&
config.exe == EX_NT && tyfunc(s->ty()) &&
config.exe == EX_WIN32 && tyfunc(s->ty()) &&
!variadic(s->Stype))
#endif
{
Expand Down
2 changes: 1 addition & 1 deletion src/backend/machobj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@ char *obj_mangle2(Symbol *s,char *dest)
if (tyfunc(s->ty()) && !variadic(s->Stype))
#else
if (!(config.flags4 & CFG4oldstdmangle) &&
config.exe == EX_NT && tyfunc(s->ty()) &&
config.exe == EX_WIN32 && tyfunc(s->ty()) &&
!variadic(s->Stype))
#endif
{
Expand Down
2 changes: 1 addition & 1 deletion src/backend/mscoffobj.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,7 @@ char *obj_mangle2(Symbol *s,char *dest)
if (tyfunc(s->ty()) && !variadic(s->Stype))
#else
if (!(config.flags4 & CFG4oldstdmangle) &&
config.exe == EX_NT && tyfunc(s->ty()) &&
config.exe == EX_WIN32 && tyfunc(s->ty()) &&
!variadic(s->Stype))
#endif
{
Expand Down
2 changes: 1 addition & 1 deletion src/backend/nteh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ code *nteh_prolog()
}
c = gen(NULL,&cs); // PUSH &__except_handler3

if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{
makeitextern(getRtlsym(RTLSYM_EXCEPT_LIST));
#if 0
Expand Down
10 changes: 5 additions & 5 deletions src/backend/out.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1231,15 +1231,15 @@ STATIC void writefunc2(symbol *sfunc)
{
case 'D': if (strcmp(id,"DllMain"))
break;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{ i = 2;
goto L2;
}
break;

case 'm': if (strcmp(id,"main"))
break;
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
i = 3;
else if (config.wflags & WFwindows)
i = 1;
Expand All @@ -1249,7 +1249,7 @@ STATIC void writefunc2(symbol *sfunc)

case 'w': if (strcmp(id,"wmain") == 0)
{
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{ i = 5;
goto L2;
}
Expand All @@ -1262,7 +1262,7 @@ STATIC void writefunc2(symbol *sfunc)
}
if (stricmp(id,"wWinMain") == 0)
{
if (config.exe == EX_NT)
if (config.exe == EX_WIN32)
{ i = 4;
goto L2;
}
Expand All @@ -1272,7 +1272,7 @@ STATIC void writefunc2(symbol *sfunc)
case 'L':
case 'l': if (stricmp(id,"LibMain"))
break;
if (config.exe != EX_NT && config.wflags & WFwindows)
if (config.exe != EX_WIN32 && config.wflags & WFwindows)
{ i = 2;
goto L2;
}
Expand Down