Merge pull request #433 from clbr/trampoline-fixes

Trampoline fixes

diff --git a/src/cc65/codeinfo.c b/src/cc65/codeinfo.c
index de51781a61c1af42fef0e06b4ec132e86c9aa7d4..e9d98f5b870d9b5021b0925b022f5915878bff49 100644 (file)
--- a/src/cc65/codeinfo.c
+++ b/src/cc65/codeinfo.c
@@ -401,6 +401,11 @@ void GetFuncInfo (const char* Name, unsigned short* Use, unsigned short* Chg)
             */
             if ((D->Flags & FD_VARIADIC) != 0) {
                 *Use = REG_Y;
+            } else if (D->Flags & FD_CALL_WRAPPER) {
+                /* Wrappers may go to any functions, so mark them as using all
+                ** registers.
+                */
+                *Use = REG_EAXY;
             } else if (D->ParamCount > 0 &&
                        (AutoCDecl ?
                         IsQualFastcall (E->Type) :

diff --git a/src/cc65/funcdesc.h b/src/cc65/funcdesc.h
index 040f6e97c91cf70b5dfc3c1b3ad586a8a8296ff1..a04ffb14a4bf037395bfe7e22083646318e7599f 100644 (file)
--- a/src/cc65/funcdesc.h
+++ b/src/cc65/funcdesc.h
@@ -52,9 +52,10 @@
 #define FD_OLDSTYLE             0x0010U /* Old style (K&R) function          */
 #define FD_OLDSTYLE_INTRET      0x0020U /* K&R func has implicit int return  */
 #define FD_UNNAMED_PARAMS       0x0040U /* Function has unnamed params       */
+#define FD_CALL_WRAPPER         0x0080U /* This function is used as a wrapper */
 
 /* Bits that must be ignored when comparing funcs */
-#define FD_IGNORE       (FD_OLDSTYLE | FD_OLDSTYLE_INTRET | FD_UNNAMED_PARAMS)
+#define FD_IGNORE       (FD_OLDSTYLE | FD_OLDSTYLE_INTRET | FD_UNNAMED_PARAMS | FD_CALL_WRAPPER)
 
 
 

diff --git a/src/cc65/pragma.c b/src/cc65/pragma.c
index 8d5dfd8b17882e30855992518904eb7495d8ea72..3dfc6266824cb9fd3de7d04fffbea84257185867 100644 (file)
--- a/src/cc65/pragma.c
+++ b/src/cc65/pragma.c
@@ -513,6 +513,7 @@ static void WrappedCallPragma (StrBuf* B)
 
         PushWrappedCall(Entry, Val);
         Entry->Flags |= SC_REF;
+        Entry->V.F.Func->Flags |= FD_CALL_WRAPPER;
 
     } else {
 

diff --git a/test/val/trampoline-params.c b/test/val/trampoline-params.c
new file mode 100644 (file)
index 0000000..890e43e
--- /dev/null
+++ b/test/val/trampoline-params.c
@@ -0,0 +1,32 @@
+/*
+  !!DESCRIPTION!! wrapped-call pragma w/ many params
+  !!ORIGIN!!      cc65 regression tests
+  !!LICENCE!!     Public Domain
+  !!AUTHOR!!      Lauri Kasanen
+*/
+
+#include <stdarg.h>
+
+static unsigned char flag;
+
+static void trampoline_set() {
+       asm("ldy tmp4");
+       asm("sty %v", flag);
+       asm("jsr callptr4");
+}
+
+#pragma wrapped-call(push, trampoline_set, 4)
+long adder(long in);
+#pragma wrapped-call(pop)
+
+long adder(long in) {
+
+       return in + 7;
+}
+
+int main() {
+
+       flag = 0;
+
+       return adder(70436) == 70436 + 7 && flag == 4 ? 0 : 1;
+}

diff --git a/test/val/trampoline-varargs.c b/test/val/trampoline-varargs.c
new file mode 100644 (file)
index 0000000..d154a3d
--- /dev/null
+++ b/test/val/trampoline-varargs.c
@@ -0,0 +1,48 @@
+/*
+  !!DESCRIPTION!! wrapped-call pragma w/ variadic function
+  !!ORIGIN!!      cc65 regression tests
+  !!LICENCE!!     Public Domain
+  !!AUTHOR!!      Lauri Kasanen
+*/
+
+#include <stdarg.h>
+
+static unsigned char flag;
+
+static void trampoline_set() {
+       // The Y register is used for variadics - save and restore
+       asm("sty tmp3");
+
+       asm("ldy tmp4");
+       asm("sty %v", flag);
+
+       asm("ldy tmp3");
+       asm("jsr callptr4");
+}
+
+#pragma wrapped-call(push, trampoline_set, 4)
+unsigned adder(unsigned char num, ...);
+#pragma wrapped-call(pop)
+
+unsigned adder(unsigned char num, ...) {
+
+       unsigned char i;
+       unsigned sum = 0;
+       va_list ap;
+       va_start(ap, num);
+
+       for (i = 0; i < num; i++) {
+               sum += va_arg(ap, unsigned);
+       }
+
+       va_end(ap);
+
+       return sum;
+}
+
+int main() {
+
+       flag = 0;
+
+       return adder(3, 0, 5, 500) == 505 && flag == 4 ? 0 : 1;
+}