Changeset 331

Timestamp:

May 2, 2008, 8:13:05 PM (17 years ago)

Author:

cinc

Message:

Fixed ticket #20. Not a perfect solution, though...

Location:

trunk

Files:

• nom/Makefile.kmk (modified) (1 diff)
• nom/include/thunk.h (added)
• nom/src/nombuildclass.c (modified) (3 diffs)
• nom/src/nombuildnomobj.c (modified) (2 diffs)
• nom/src/thunk.c (added)
• tests/c/test-nom.c (modified) (1 diff)

trunk/nom/Makefile.kmk

@@ -35 +35 @@
         src/nomid.c \
         src/nomgc.c \
+        src/thunk.c \
         class_c/nomobj.c \
         class_c/nomclassmanager.c \

trunk/nom/src/nombuildclass.c

@@ -59 +59 @@
 #include <nomclassmanager.h>
 
+#include <thunk.h>
+
 /* Define if you want to have messages from nomBuildClass() and friends */
 //#define DEBUG_NOMBUILDCLASS
@@ -98 +100 @@
 /******************* somBuildClass **********************/
 
+#if 0
 /*
   Thunking code to get the instance var address from an object pointer pushed
@@ -115 +118 @@
  */
 static gulong mThunkCode[]={0x04244c8b, 0xff00518b, 0x0000aca2 , 0x16000000};
-
+#endif
 
 /***********************************************************************************/

trunk/nom/src/nombuildnomobj.c

@@ -48 +48 @@
 #include <nomtk.h>
 #include <nomobj.h>
+#include <thunk.h>
 
 /********************************************************/
@@ -60 +61 @@
 extern PNOM_ENV pGlobalNomEnv;
 
+
+/********************************************************/
+
+
 /*
-  Thunking code to get the instance var address from an object pointer pushed
-  on the stack. The following translates into this assembler code:
-
-  MOV EAX,DWORD PTR [ESP+4] ;Move object ptr into EAX
-  ADD EAX, +4
-  RET
-*/
-
-static gulong thunk[]={0x0424448b, 0x00000405, 0x0000c300};
-
-/*
-MOV ECX,DWORD PTR [ESP+4] : move object pointer from stack in ECX
-MOV EDX,DWORD PTR [ECX]   : move [ECX] in EDX -> mtab in EDX
-JMP DWORD PTR [EDX+0ACh]  : JMP to address pointing to by EDX+0ACh
- */
-static gulong mThunkCode[]={0x04244c8b, 0xff00518b, 0x0000aca2 , 0x16000000};
-
-/********************************************************/
-
-
-/*
-  Create the SOMClassPriv structure *only* for SOMObject and fill it with info
+  Create the NOMClassPriv structure *only* for NOMObject and fill it with info
   from the sci.
 

trunk/tests/c/test-nom.c

@@ -253 +253 @@
   /* Init NOM */
   NOMClassMgrObject=nomEnvironmentNew();
-
+  
   g_message("\n");
   g_message("================================================================");