#include "scanstrbuf.h"
#include "symtab.h"
#include "pragma.h"
-#include "trampoline.h"
+#include "wrappedcall.h"
PRAGMA_DATASEG, /* obsolete */
PRAGMA_INLINE_STDFUNCS,
PRAGMA_LOCAL_STRINGS,
+ PRAGMA_MESSAGE,
PRAGMA_OPTIMIZE,
- PRAGMA_REGVARADDR,
PRAGMA_REGISTER_VARS,
+ PRAGMA_REGVARADDR,
PRAGMA_REGVARS, /* obsolete */
PRAGMA_RODATA_NAME,
PRAGMA_RODATASEG, /* obsolete */
PRAGMA_SIGNEDCHARS, /* obsolete */
PRAGMA_STATIC_LOCALS,
PRAGMA_STATICLOCALS, /* obsolete */
- PRAGMA_TRAMPOLINE,
PRAGMA_WARN,
+ PRAGMA_WRAPPED_CALL,
PRAGMA_WRITABLE_STRINGS,
PRAGMA_ZPSYM,
PRAGMA_COUNT
{ "dataseg", PRAGMA_DATASEG }, /* obsolete */
{ "inline-stdfuncs", PRAGMA_INLINE_STDFUNCS },
{ "local-strings", PRAGMA_LOCAL_STRINGS },
+ { "message", PRAGMA_MESSAGE },
{ "optimize", PRAGMA_OPTIMIZE },
{ "register-vars", PRAGMA_REGISTER_VARS },
{ "regvaraddr", PRAGMA_REGVARADDR },
{ "signedchars", PRAGMA_SIGNEDCHARS }, /* obsolete */
{ "static-locals", PRAGMA_STATIC_LOCALS },
{ "staticlocals", PRAGMA_STATICLOCALS }, /* obsolete */
- { "trampoline", PRAGMA_TRAMPOLINE },
{ "warn", PRAGMA_WARN },
+ { "wrapped-call", PRAGMA_WRAPPED_CALL },
{ "writable-strings", PRAGMA_WRITABLE_STRINGS },
{ "zpsym", PRAGMA_ZPSYM },
};
}
/* Error */
- Error ("Pragma argument must be one of `on', `off', `true' or `false'");
+ Error ("Pragma argument must be one of 'on', 'off', 'true' or 'false'");
return 0;
}
static void SegNamePragma (StrBuf* B, segment_t Seg)
/* Handle a pragma that expects a segment name parameter */
{
- StrBuf S = AUTO_STRBUF_INITIALIZER;
const char* Name;
+ StrBuf S = AUTO_STRBUF_INITIALIZER;
+ int Push = 0;
/* Check for the "push" or "pop" keywords */
- int Push = 0;
switch (ParsePushPop (B)) {
case PP_NONE:
case PP_POP:
/* Pop the old value and output it */
PopSegName (Seg);
- g_segname (Seg);
+
+ /* BSS variables are output at the end of the compilation. Don't
+ ** bother to change their segment, now.
+ */
+ if (Seg != SEG_BSS) {
+ g_segname (Seg);
+ }
/* Done */
goto ExitPoint;
} else {
SetSegName (Seg, Name);
}
- g_segname (Seg);
+
+ /* BSS variables are output at the end of the compilation. Don't
+ ** bother to change their segment, now.
+ */
+ if (Seg != SEG_BSS) {
+ g_segname (Seg);
+ }
} else {
/* Segment name is invalid */
- Error ("Illegal segment name: `%s'", Name);
+ Error ("Illegal segment name: '%s'", Name);
}
}
-static void TrampolinePragma (StrBuf* B)
-/* Handle the trampoline pragma */
+static void WrappedCallPragma (StrBuf* B)
+/* Handle the wrapped-call pragma */
{
StrBuf S = AUTO_STRBUF_INITIALIZER;
const char *Name;
break;
case PP_POP:
- PopTrampoline();
+ PopWrappedCall();
/* Done */
goto ExitPoint;
/* Skip the following comma */
if (!GetComma (B)) {
/* Error already flagged by GetComma */
- Error ("Value required for trampoline data");
+ Error ("Value required for wrapped-call identifier");
goto ExitPoint;
}
if (!GetNumber (B, &Val)) {
- Error ("Value required for trampoline data");
+ Error ("Value required for wrapped-call identifier");
goto ExitPoint;
}
if (Val < 0 || Val > 255) {
- Error ("Value must be between 0-255");
+ Error ("Identifier must be between 0-255");
goto ExitPoint;
}
Entry = FindSym(Name);
/* Check if the name is valid */
- if (Entry && Entry->Flags & (SC_FUNC | SC_STORAGE)) {
+ if (Entry && Entry->Flags & SC_FUNC) {
- PushTrampoline(Entry, Val);
+ PushWrappedCall(Entry, (unsigned char) Val);
Entry->Flags |= SC_REF;
+ Entry->V.F.Func->Flags |= FD_CALL_WRAPPER;
} else {
/* Segment name is invalid */
- Error ("Trampoline does not exist or is not a function or array");
+ Error ("Wrapped-call target does not exist or is not a function");
}
+static void MakeMessage (const char* Message)
+{
+ fprintf (stderr, "%s(%u): Note: %s\n", GetInputName (CurTok.LI), GetInputLine (CurTok.LI), Message);
+}
+
+
+
static void ParsePragma (void)
/* Parse the contents of the _Pragma statement */
{
** for unknown pragmas, but warn about them if enabled (the default).
*/
if (IS_Get (&WarnUnknownPragma)) {
- Warning ("Unknown pragma `%s'", SB_GetConstBuf (&Ident));
+ Warning ("Unknown pragma '%s'", SB_GetConstBuf (&Ident));
}
goto ExitPoint;
}
FlagPragma (&B, &LocalStrings);
break;
+ case PRAGMA_MESSAGE:
+ StringPragma (&B, MakeMessage);
+ break;
+
case PRAGMA_OPTIMIZE:
FlagPragma (&B, &Optimize);
break;
FlagPragma (&B, &StaticLocals);
break;
- case PRAGMA_TRAMPOLINE:
- TrampolinePragma(&B);
- break;
+ case PRAGMA_WRAPPED_CALL:
+ WrappedCallPragma(&B);
+ break;
case PRAGMA_WARN:
WarnPragma (&B);