Changeset 1232 for trunk/testcase/572main.cpp

Timestamp:

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

Author:

bird

Message:

Extended to third calling convention syntax.

File:

• trunk/testcase/572main.cpp (modified) (14 diffs, 1 prop)

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);
+#ifdef __EMX__
+typedef void    _Optlink   (Typedef3Void)(int a, int b, int c, int d);
+typedef void *  _Optlink   (Typedef3PVoid)(int a, int b, int c, int d);
+typedef int     _Optlink   (Typedef3Int)(int a, int b, int c, int d);
+typedef PTYPE   _Optlink   (Typedef3PType)(int a, int b, int c, int d);
+#endif
 
 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);
+#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
 
 
@@ -99 +112 @@
     int     (_Optlink * PStructMember2Int)(int a, int b, int c, int d);
     PTYPE   (_Optlink * PStructMember2PType)(int a, int b, int c, int d);
+#ifdef __EMX__
+    /* Alternate writing which should have the same effect I think... */
+    void    _Optlink (* PStructMember3Void)(int a, int b, int c, int d);
+    void *  _Optlink (* PStructMember3PVoid)(int a, int b, int c, int d);
+    int     _Optlink (* PStructMember3Int)(int a, int b, int c, int d);
+    PTYPE   _Optlink (* PStructMember3PType)(int a, int b, int c, int d);
+#endif
 
 } 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);
+#ifdef __EMX__
+void    _Optlink (* PVar3Void)(int a, int b, int c, int d);
+void *  _Optlink (* PVar3PVoid)(int a, int b, int c, int d);
+int     _Optlink (* PVar3Int)(int a, int b, int c, int d);
+PTYPE   _Optlink (* PVar3PType)(int a, int b, int c, int d);
+#endif
 
 
@@ -130 +156 @@
     int     (_Optlink * pfn2Int)(int a, int b, int c, int d),
     PTYPE   (_Optlink * pfn2PType)(int a, int b, int c, int d)
+#ifdef __EMX__
+    ,
+    void    _Optlink (* pfn3Void)(int a, int b, int c, int d),
+    void *  _Optlink (* pfn3PVoid)(int a, int b, int c, int d),
+    int     _Optlink (* pfn3Int)(int a, int b, int c, int d),
+    PTYPE   _Optlink (* pfn3PType)(int a, int b, int c, int d)
+#endif
     )
 {
@@ -141 +174 @@
     pfn2Int(1,2,3,4);
     pfn2PType(1,2,3,4);
+#ifdef __EMX__
+    pfn3Void(1,2,3,4);
+    pfn3PVoid(1,2,3,4);
+    pfn3Int(1,2,3,4);
+    pfn3PType(1,2,3,4);
+#endif
     return 0;
 }
+
+/* @todo: extend and fix this */
+extern void ParamArgs_1(void (_Optlink *)(void));
+extern void ParamArgs_2(void (* _Optlink fixme) (void));
+#ifdef __EMX__
+extern void ParamArgs_3(void _Optlink (*)(void));
+#endif
 
 
@@ -149 +195 @@
 {
     static VFT vft = {Void, PVoid, Int, PType,
+#ifdef __EMX__
+                      Void, PVoid, Int, PType,
+#endif
                       Void, PVoid, Int, PType};
 
@@ -160 +209 @@
     static Typedef2Int        * pfnTypedef2Int    = Int;
     static Typedef2PType      * pfnTypedef2PType  = PType;
+#ifdef __EMX__
+    static Typedef3Void       * pfnTypedef3Void   = Void;
+    static Typedef3PVoid      * pfnTypedef3PVoid  = PVoid;
+    static Typedef3Int        * pfnTypedef3Int    = Int;
+    static Typedef3PType      * pfnTypedef3PType  = PType;
+#endif
 
     static PTypedef1Void        pfnPTypedef1Void  = Void;
@@ -170 +225 @@
     static PTypedef2Int         pfnPTypedef2Int   = Int;
     static PTypedef2PType       pfnPTypedef2PType = PType;
+#ifdef __EMX__
+    static PTypedef3Void        pfnPTypedef3Void  = Void;
+    static PTypedef3PVoid       pfnPTypedef3PVoid = PVoid;
+    static PTypedef3Int         pfnPTypedef3Int   = Int;
+    static PTypedef3PType       pfnPTypedef3PType = PType;
+#endif
 
     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);
+#ifdef __EMX__
+    pfnTypedef3Void(1,2,3,4);
+    pfnTypedef3PVoid(1,2,3,4);
+    pfnTypedef3Int(1,2,3,4);
+    pfnTypedef3PType(1,2,3,4);
+#endif
 
     pfnPTypedef1Void(1,2,3,4);
@@ -225 +297 @@
     pfnPTypedef2Int(1,2,3,4);
     pfnPTypedef2PType(1,2,3,4);
+#ifdef __EMX__
+    pfnPTypedef3Void(1,2,3,4);
+    pfnPTypedef3PVoid(1,2,3,4);
+    pfnPTypedef3Int(1,2,3,4);
+    pfnPTypedef3PType(1,2,3,4);
+#endif
 
 
@@ -237 +315 @@
     vft.PStructMember2Int(1,2,3,4);
     vft.PStructMember2PType(1,2,3,4);
+#ifdef __EMX__
+    vft.PStructMember3Void(1,2,3,4);
+    vft.PStructMember3PVoid(1,2,3,4);
+    vft.PStructMember3Int(1,2,3,4);
+    vft.PStructMember3PType(1,2,3,4);
+#endif
 
     /* variables */
@@ -251 +335 @@
     /* parameters */
     ParamArgs(Void, PVoid, Int, PType,
+#ifdef __EMX__
+              Void, PVoid, Int, PType,
+#endif
               Void, PVoid, Int, PType);