#include "scanner.h"
#include "standard.h"
#include "symtab.h"
-#include "trampoline.h"
+#include "wrappedcall.h"
#include "typeconv.h"
{
unsigned Offs;
SymEntry* Sym;
- SymEntry* Trampoline;
- unsigned char TrampolineData;
+ SymEntry* WrappedCall;
+ unsigned char WrappedCallData;
/* Create a new function descriptor */
FuncDesc* F = NewFuncDesc ();
/* Leave the lexical level remembering the symbol tables */
RememberFunctionLevel (F);
- /* Did we have a trampoline for this function? */
- GetTrampoline((void **) &Trampoline, &TrampolineData);
- if (Trampoline) {
- F->Trampoline = Trampoline;
- F->TrampolineData = TrampolineData;
+ /* Did we have a WrappedCall for this function? */
+ GetWrappedCall((void **) &WrappedCall, &WrappedCallData);
+ if (WrappedCall) {
+ F->WrappedCall = WrappedCall;
+ F->WrappedCallData = WrappedCallData;
}
/* Return the function descriptor */
Qualifiers &= ~T_QUAL_FASTCALL;
}
- /* Was there a previous entry? If so, copy trampoline info from it */
+ /* Was there a previous entry? If so, copy WrappedCall info from it */
PrevEntry = FindGlobalSym (D->Ident);
if (PrevEntry && PrevEntry->Flags & SC_FUNC) {
FuncDesc* D = PrevEntry->V.F.Func;
- if (D->Trampoline && !F->Trampoline) {
- F->Trampoline = D->Trampoline;
- F->TrampolineData = D->TrampolineData;
+ if (D->WrappedCall && !F->WrappedCall) {
+ F->WrappedCall = D->WrappedCall;
+ F->WrappedCallData = D->WrappedCallData;
}
}
/* Special handling for function pointers */
if (IsFuncPtr) {
- if (Func->Trampoline) {
- Warning("Calling a trampolined function via a pointer, trampoline will not be used");
+ if (Func->WrappedCall) {
+ Warning("Calling a wrapped function via a pointer, wrapped-call will not be used");
}
/* If the function is not a fastcall function, load the pointer to
} else {
/* Normal function */
- if (Func->Trampoline) {
+ if (Func->WrappedCall) {
char tmp[64];
StrBuf S = AUTO_STRBUF_INITIALIZER;
- /* Store the trampoline data in tmp4 */
- sprintf(tmp, "ldy #%u", Func->TrampolineData);
+ /* Store the WrappedCall data in tmp4 */
+ sprintf(tmp, "ldy #%u", Func->WrappedCallData);
SB_AppendStr (&S, tmp);
g_asmcode (&S);
SB_Clear(&S);
SB_Done (&S);
- g_call (TypeOf (Expr->Type), Func->Trampoline->Name, ParamSize);
+ g_call (TypeOf (Expr->Type), Func->WrappedCall->Name, ParamSize);
} else {
g_call (TypeOf (Expr->Type), (const char*) Expr->Name, ParamSize);
}
F->ParamCount = 0;
F->ParamSize = 0;
F->LastParam = 0;
- F->Trampoline = 0;
- F->TrampolineData = 0;
+ F->WrappedCall = 0;
+ F->WrappedCallData = 0;
/* Return the new struct */
return F;
unsigned ParamCount; /* Number of parameters */
unsigned ParamSize; /* Size of the parameters */
struct SymEntry* LastParam; /* Pointer to last parameter */
- struct SymEntry* Trampoline; /* Pointer to the trampoline */
- unsigned char TrampolineData; /* The trampoline's user data */
+ struct SymEntry* WrappedCall; /* Pointer to the WrappedCall */
+ unsigned char WrappedCallData; /* The WrappedCall's user data */
};
#include "scanstrbuf.h"
#include "symtab.h"
#include "pragma.h"
-#include "trampoline.h"
+#include "wrappedcall.h"
break;
case PP_POP:
- PopTrampoline();
+ PopWrappedCall();
/* Done */
goto ExitPoint;
/* Check if the name is valid */
if (Entry && Entry->Flags & (SC_FUNC | SC_STORAGE)) {
- PushTrampoline(Entry, Val);
+ PushWrappedCall(Entry, Val);
Entry->Flags |= SC_REF;
} else {
+++ /dev/null
-/*****************************************************************************/
-/* */
-/* trampoline.c */
-/* */
-/* Trampoline management */
-/* */
-/* */
-/* */
-/* (C) 2017, Mega Cat Studios */
-/* */
-/* */
-/* This software is provided 'as-is', without any expressed or implied */
-/* warranty. In no event will the authors be held liable for any damages */
-/* arising from the use of this software. */
-/* */
-/* Permission is granted to anyone to use this software for any purpose, */
-/* including commercial applications, and to alter it and redistribute it */
-/* freely, subject to the following restrictions: */
-/* */
-/* 1. The origin of this software must not be misrepresented; you must not */
-/* claim that you wrote the original software. If you use this software */
-/* in a product, an acknowledgment in the product documentation would be */
-/* appreciated but is not required. */
-/* 2. Altered source versions must be plainly marked as such, and must not */
-/* be misrepresented as being the original software. */
-/* 3. This notice may not be removed or altered from any source */
-/* distribution. */
-/* */
-/*****************************************************************************/
-
-
-
-#include <stdarg.h>
-#include <string.h>
-
-/* common */
-#include "chartype.h"
-#include "check.h"
-#include "coll.h"
-#include "scanner.h"
-#include "intptrstack.h"
-#include "xmalloc.h"
-
-/* cc65 */
-#include "codeent.h"
-#include "error.h"
-#include "trampoline.h"
-
-
-
-/*****************************************************************************/
-/* Data */
-/*****************************************************************************/
-
-
-/* Trampolines */
-static IntPtrStack Trampolines;
-
-
-
-/*****************************************************************************/
-/* Code */
-/*****************************************************************************/
-
-
-
-void PushTrampoline (void *Ptr, unsigned char Val)
-/* Push the current trampoline */
-{
- if (IPS_IsFull (&Trampolines)) {
- Error ("Trampoline stack overflow");
- } else {
- IPS_Push (&Trampolines, Val, Ptr);
- }
-}
-
-
-
-void PopTrampoline (void)
-/* Remove the current trampoline */
-{
- if (IPS_GetCount (&Trampolines) < 1) {
- Error ("Trampoline stack is empty");
- } else {
- IPS_Drop (&Trampolines);
- }
-}
-
-
-
-void GetTrampoline (void **Ptr, unsigned char *Val)
-/* Get the current trampoline */
-{
- if (IPS_GetCount (&Trampolines) < 1) {
- *Ptr = NULL;
- *Val = 0;
- } else {
- long Temp;
- IPS_Get (&Trampolines, &Temp, Ptr);
- *Val = Temp;
- }
-}
+++ /dev/null
-/*****************************************************************************/
-/* */
-/* trampoline.h */
-/* */
-/* Trampoline management */
-/* */
-/* */
-/* */
-/* (C) 2017, Mega Cat Studios */
-/* */
-/* */
-/* This software is provided 'as-is', without any expressed or implied */
-/* warranty. In no event will the authors be held liable for any damages */
-/* arising from the use of this software. */
-/* */
-/* Permission is granted to anyone to use this software for any purpose, */
-/* including commercial applications, and to alter it and redistribute it */
-/* freely, subject to the following restrictions: */
-/* */
-/* 1. The origin of this software must not be misrepresented; you must not */
-/* claim that you wrote the original software. If you use this software */
-/* in a product, an acknowledgment in the product documentation would be */
-/* appreciated but is not required. */
-/* 2. Altered source versions must be plainly marked as such, and must not */
-/* be misrepresented as being the original software. */
-/* 3. This notice may not be removed or altered from any source */
-/* distribution. */
-/* */
-/*****************************************************************************/
-
-
-
-#ifndef TRAMPOLINE_H
-#define TRAMPOLINE_H
-
-
-
-#include <stdio.h>
-
-/* common */
-#include "attrib.h"
-
-/* cc65 */
-#include "opcodes.h"
-
-
-/*****************************************************************************/
-/* Code */
-/*****************************************************************************/
-
-
-
-void PushTrampoline (void *Ptr, unsigned char Val);
-/* Push the current trampoline */
-
-void PopTrampoline (void);
-/* Pop the current trampoline */
-
-void GetTrampoline (void **Ptr, unsigned char *Val);
-/* Get the current trampoline, if any */
-
-
-/* End of trampoline.h */
-
-#endif
--- /dev/null
+/*****************************************************************************/
+/* */
+/* wrappedcall.c */
+/* */
+/* WrappedCall management */
+/* */
+/* */
+/* */
+/* (C) 2017, Mega Cat Studios */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
+
+
+
+#include <stdarg.h>
+#include <string.h>
+
+/* common */
+#include "chartype.h"
+#include "check.h"
+#include "coll.h"
+#include "scanner.h"
+#include "intptrstack.h"
+#include "xmalloc.h"
+
+/* cc65 */
+#include "codeent.h"
+#include "error.h"
+#include "wrappedcall.h"
+
+
+
+/*****************************************************************************/
+/* Data */
+/*****************************************************************************/
+
+
+/* WrappedCalls */
+static IntPtrStack WrappedCalls;
+
+
+
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+void PushWrappedCall (void *Ptr, unsigned char Val)
+/* Push the current WrappedCall */
+{
+ if (IPS_IsFull (&WrappedCalls)) {
+ Error ("WrappedCall stack overflow");
+ } else {
+ IPS_Push (&WrappedCalls, Val, Ptr);
+ }
+}
+
+
+
+void PopWrappedCall (void)
+/* Remove the current WrappedCall */
+{
+ if (IPS_GetCount (&WrappedCalls) < 1) {
+ Error ("WrappedCall stack is empty");
+ } else {
+ IPS_Drop (&WrappedCalls);
+ }
+}
+
+
+
+void GetWrappedCall (void **Ptr, unsigned char *Val)
+/* Get the current WrappedCall */
+{
+ if (IPS_GetCount (&WrappedCalls) < 1) {
+ *Ptr = NULL;
+ *Val = 0;
+ } else {
+ long Temp;
+ IPS_Get (&WrappedCalls, &Temp, Ptr);
+ *Val = Temp;
+ }
+}
--- /dev/null
+/*****************************************************************************/
+/* */
+/* wrappedcall.h */
+/* */
+/* Wrapped-call management */
+/* */
+/* */
+/* */
+/* (C) 2017, Mega Cat Studios */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
+
+
+
+#ifndef WRAPPEDCALL_H
+#define WRAPPEDCALL_H
+
+
+
+#include <stdio.h>
+
+/* common */
+#include "attrib.h"
+
+/* cc65 */
+#include "opcodes.h"
+
+
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+void PushWrappedCall (void *Ptr, unsigned char Val);
+/* Push the current WrappedCall */
+
+void PopWrappedCall (void);
+/* Pop the current WrappedCall */
+
+void GetWrappedCall (void **Ptr, unsigned char *Val);
+/* Get the current WrappedCall, if any */
+
+
+/* End of wrappedcall.h */
+
+#endif
projects / cc65 / commitdiff