encounter
/
MWCC
mirror of https://git.wuffs.org/MWCC
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixing

This commit is contained in:
Ash Wolf 2023-01-12 03:01:34 +00:00
parent 54bb1363a2
commit 3a6db389b2
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command_line/CmdLine/Src/Plugins/CLPlugins.c
View File

@ -161,7 +161,7 @@ const OSFileTypeMappingList *Plugin_GetFileTypeMappingList(Plugin *pl) {
} }
const CWObjectFlags *Plugin_CL_GetObjectFlags(Plugin *pl) { const CWObjectFlags *Plugin_CL_GetObjectFlags(Plugin *pl) {
static CWObjectFlags fake = { static const CWObjectFlags fake = {
2, 0, 2, 0,
"", "", "", "", "", "", "", "", "", "", "", "",
0, 0, 0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

2
compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c
View File

@ -75,7 +75,7 @@ static int MidParse() {
pCmdLine.state = OptsCmdLineState_2; pCmdLine.state = OptsCmdLineState_2;
if (parseopts.possibleFiles > 0 && useDefaultIncludes) { if (parseopts.possibleFiles > 0 && useDefaultIncludes) {
if ((env = GetEnvVar("MWCMachPPCIncludes", 1, &match))) { if ((env = GetEnvVar("MWCMachPPCIncludes\0MWCIncludes\0", 1, &match))) {
// FIXME can probably get rid of this cast later // FIXME can probably get rid of this cast later
if (!AddAccessPathList(env, ':', ',', 1, (char *) match, 1, -1, 0)) if (!AddAccessPathList(env, ':', ',', 1, (char *) match, 1, -1, 0))
return 0; return 0;

2
compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
View File

@ -8,7 +8,7 @@ CWPLUGIN_ENTRY (PPCLibImport_GetDropInFlags)(const DropInFlags **flags, SInt32 *
kCurrentDropInFlagsVersion, kCurrentDropInFlagsVersion,
CWDROPINCOMPILERTYPE, CWDROPINCOMPILERTYPE,
DROPINCOMPILERLINKERAPIVERSION_8, DROPINCOMPILERLINKERAPIVERSION_8,
kGeneratescode | kCanpreprocess | kCanprecompile | kCompAllowDupFileNames | kCompMultiTargAware, kGeneratescode | kCompAllowDupFileNames | kCompMultiTargAware,
Lang_MISC, Lang_MISC,
DROPINCOMPILERLINKERAPIVERSION_12 DROPINCOMPILERLINKERAPIVERSION_12
}; };

2
compiler_and_linker/unsorted/CodeGen.c
View File

@ -1217,7 +1217,7 @@ Boolean CodeGen_ReInitRuntimeObjects(Boolean is_precompiler) {
rt_cvt_dbl_usll->name = GetHashNameNodeExport("__cvt_dbl_usll"); rt_cvt_dbl_usll->name = GetHashNameNodeExport("__cvt_dbl_usll");
CMach_ReInitRuntimeObjects(); CMach_ReInitRuntimeObjects();
Intrinsics_ReInitRuntimeObjects(is_precompiler); return Intrinsics_ReInitRuntimeObjects(is_precompiler);
} }
Boolean CodeGen_IsPublicRuntimeObject(Object *obj) { Boolean CodeGen_IsPublicRuntimeObject(Object *obj) {

20
unsorted/Option.c
View File

@ -82,13 +82,12 @@ int Args_StackSize(void) {
void Args_Push(short flags, void *first, void *second) { void Args_Push(short flags, void *first, void *second) {
OS_ASSERT(104, oStackPtr<MAXSTACK); OS_ASSERT(104, oStackPtr<MAXSTACK);
if (oStackPtr > 0) if (oStackPtr > 0) {
{
short prev = short prev =
(flags & ARGFLAG_1) ? ARGFLAG_2 : (flags & ARGFLAG_1) ? ARGFLAG_2 :
(flags & ARGFLAG_2) ? ARGFLAG_1 : (flags & ARGFLAG_2) ? ARGFLAG_1 :
(flags & ARGFLAG_4) ? ARGFLAG_2 : -1; (flags & ARGFLAG_4) ? ARGFLAG_2 : -1;
OPTION_ASSERT(oStack[oStackPtr-1].flags & prev); OS_ASSERT(111, oStack[oStackPtr-1].flags & prev);
} }
oStack[oStackPtr].e.v.first = first; oStack[oStackPtr].e.v.first = first;
@ -97,11 +96,10 @@ void Args_Push(short flags, void *first, void *second) {
oStackPtr++; oStackPtr++;
} }
Opt48 *Args_Pop(short flags) Opt48 *Args_Pop(short flags) {
{ OS_ASSERT(122, oStackPtr>0);
OPTION_ASSERT(oStackPtr>0);
--oStackPtr; --oStackPtr;
OPTION_ASSERT(oStack[oStackPtr].flags & flags); OS_ASSERT(124, oStack[oStackPtr].flags & flags);
return &oStack[oStackPtr]; return &oStack[oStackPtr];
} }
@ -374,7 +372,13 @@ static Boolean Option_ContinuesThisLevel(int level, ArgToken *tok) {
} }
} }
static short endingStack[5][3]; static short endingStack[5][3] = {
ATK_END, ATK_END, ATK_END,
ATK_ARG_END, ATK_COMMA, ATK_OPTION,
ATK_COMMA, ATK_END, ATK_END,
ATK_EQUALS, ATK_END, ATK_END,
ATK_END, ATK_END, ATK_END
};
static Boolean Option_IsEndingThisLevel(int level, ArgToken *tok) { static Boolean Option_IsEndingThisLevel(int level, ArgToken *tok) {
ArgToken *tmp; ArgToken *tmp;