Changeset 1232 for trunk/testcase

Timestamp:

Feb 12, 2004, 4:21:45 PM (22 years ago)

Author:

bird

Message:

Extended to third calling convention syntax.

Location:

trunk/testcase

Files:

• 572c.c (modified) (14 diffs, 1 prop)
• 572main.cpp (modified) (14 diffs, 1 prop)

trunk/testcase/572c.c

@@ -37 +37 @@
 typedef int     (_Optlink   Typedef2Int)(int a, int b, int c, int d);
 typedef PTYPE   (_Optlink   Typedef2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
 
 typedef void    (* _Optlink PTypedef1Void)(int a, int b, int c, int d);
@@ -48 +54 @@
 typedef int     (_Optlink * PTypedef2Int)(int a, int b, int c, int d);
 typedef PTYPE   (_Optlink * PTypedef2PType)(int a, int b, int c, int d);
-
+#ifdef __EMX__
+/* Alternate writing which should have the same effect I think... */
+typedef void    _Optlink (* PTypedef3Void)(int a, int b, int c, int d);
+typedef void *  _Optlink (* PTypedef3PVoid)(int a, int b, int c, int d);
+typedef int     _Optlink (* PTypedef3Int)(int a, int b, int c, int d);
+typedef PTYPE   _Optlink (* PTypedef3PType)(int a, int b, int c, int d);
+#endif
 
 /*
@@ -66 +78 @@
     PTYPE   (_Optlink * PStructMember2PType)(int a, int b, int c, int d);
 
+
+
+
+
+
+
+
 } VFT, *PVFT;
 
@@ -82 +101 @@
 int     (_Optlink * PVar2Int)(int a, int b, int c, int d);
 PTYPE   (_Optlink * PVar2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
+
 
 
@@ -96 +122 @@
     int     (_Optlink * pfn2Int)(int a, int b, int c, int d),
     PTYPE   (_Optlink * pfn2PType)(int a, int b, int c, int d)
+
+
+
+
+
+
+
     )
 {
@@ -107 +140 @@
     pfn2Int(1,2,3,4);
     pfn2PType(1,2,3,4);
+
+
+
+
+
+
+
     return 0;
 }
+
+
+
+
+
+
+
 
 
@@ -114 +161 @@
 {
     static VFT vft = {CVoid, CPVoid, CInt, CPType,
+
+
+
                       CVoid, CPVoid, CInt, CPType};
 
@@ -125 +175 @@
     static Typedef2Int        * pfnTypedef2Int    = CInt;
     static Typedef2PType      * pfnTypedef2PType  = CPType;
+
+
+
+
+
+
 
     static PTypedef1Void        pfnPTypedef1Void  = CVoid;
@@ -136 +192 @@
     static PTypedef2PType       pfnPTypedef2PType = CPType;
 
+
+
+
+
+
+
+
     PVar1Void   = CVoid;
     PVar1PVoid  = CPVoid;
@@ -146 +209 @@
     PVar2PType  = CPType;
 
+
+
+
+
+
+
 
     /* extern functions */
@@ -164 +233 @@
     pfnTypedef2PType(1,2,3,4);
 
+
+
+
+
+
+
+
     pfnPTypedef1Void(1,2,3,4);
     pfnPTypedef1PVoid(1,2,3,4);
@@ -174 +250 @@
     pfnPTypedef2PType(1,2,3,4);
 
+
+
+
+
+
+
 
     /* structs */
@@ -186 +268 @@
     vft.PStructMember2PType(1,2,3,4);
 
+
+
+
+
+
+
+
     /* variables */
     PVar1Void(1,2,3,4);
@@ -199 +288 @@
     /* parameters */
     ParamArgs(CVoid, CPVoid, CInt, CPType,
+
+
+
               CVoid, CPVoid, CInt, CPType);
 

trunk/testcase/572main.cpp

@@ -70 +70 @@
 typedef int     (_Optlink   Typedef2Int)(int a, int b, int c, int d);
 typedef PTYPE   (_Optlink   Typedef2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
 
 typedef void    (* _Optlink PTypedef1Void)(int a, int b, int c, int d);
@@ -81 +87 @@
 typedef int     (_Optlink * PTypedef2Int)(int a, int b, int c, int d);
 typedef PTYPE   (_Optlink * PTypedef2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
+
 
 
@@ -99 +112 @@
     int     (_Optlink * PStructMember2Int)(int a, int b, int c, int d);
     PTYPE   (_Optlink * PStructMember2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
+
 
 } VFT, *PVFT;
@@ -116 +136 @@
 int     (_Optlink * PVar2Int)(int a, int b, int c, int d);
 PTYPE   (_Optlink * PVar2PType)(int a, int b, int c, int d);
+
+
+
+
+
+
 
 
@@ -130 +156 @@
     int     (_Optlink * pfn2Int)(int a, int b, int c, int d),
     PTYPE   (_Optlink * pfn2PType)(int a, int b, int c, int d)
+
+
+
+
+
+
+
     )
 {
@@ -141 +174 @@
     pfn2Int(1,2,3,4);
     pfn2PType(1,2,3,4);
+
+
+
+
+
+
     return 0;
 }
+
+
+
+
+
+
+
 
 
@@ -149 +195 @@
 {
     static VFT vft = {Void, PVoid, Int, PType,
+
+
+
                       Void, PVoid, Int, PType};
 
@@ -160 +209 @@
     static Typedef2Int        * pfnTypedef2Int    = Int;
     static Typedef2PType      * pfnTypedef2PType  = PType;
+
+
+
+
+
+
 
     static PTypedef1Void        pfnPTypedef1Void  = Void;
@@ -170 +225 @@
     static PTypedef2Int         pfnPTypedef2Int   = Int;
     static PTypedef2PType       pfnPTypedef2PType = PType;
+
+
+
+
+
+
 
     PVar1Void   = Void;
@@ -180 +241 @@
     PVar2Int    = Int;
     PVar2PType  = PType;
-
+#ifdef __EMX__
+    PVar3Void   = Void;
+    PVar3PVoid  = PVoid;
+    PVar3Int    = Int;
+    PVar3PType  = PType;
+#endif
 
     /* extern functions */
@@ -215 +281 @@
     pfnTypedef2Int(1,2,3,4);
     pfnTypedef2PType(1,2,3,4);
+
+
+
+
+
+
 
     pfnPTypedef1Void(1,2,3,4);
@@ -225 +297 @@
     pfnPTypedef2Int(1,2,3,4);
     pfnPTypedef2PType(1,2,3,4);
+
+
+
+
+
+
 
 
@@ -237 +315 @@
     vft.PStructMember2Int(1,2,3,4);
     vft.PStructMember2PType(1,2,3,4);
+
+
+
+
+
+
 
     /* variables */
@@ -251 +335 @@
     /* parameters */
     ParamArgs(Void, PVoid, Int, PType,
+
+
+
               Void, PVoid, Int, PType);