[kaffe] CVS kaffe (robilad): cleaned up use of jitCodeHeader and fixed an intrp warning

[Kaffe CVS]

PatchSet 7265 
Date: 2006/04/23 01:32:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
cleaned up use of jitCodeHeader and fixed an intrp warning

2006-04-23  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffevm/classMethod.c (getMethodCodeStart)
(setMethodCodeStart): Replace struct _jitCodeHeader
by jitCodeHeader, which is then suitably defined in
each engine.

* kaffe/kaffevm/intrp/machine.h: Define jitCodeHeader type
to fix compiler warning.

* kaffe/kaffevm/classMethod.h: Use jitCodeHeader instead of
struct _jitCodeHeader.

Members: 
	ChangeLog:1.4770->1.4771 
	kaffe/kaffevm/classMethod.c:1.156->1.157 
	kaffe/kaffevm/classMethod.h:1.89->1.90 
	kaffe/kaffevm/intrp/machine.h:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4770 kaffe/ChangeLog:1.4771
--- kaffe/ChangeLog:1.4770	Sat Apr 22 23:42:04 2006
+++ kaffe/ChangeLog	Sun Apr 23 01:32:11 2006
@@ -1,5 +1,18 @@
 2006-04-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* kaffe/kaffevm/classMethod.c (getMethodCodeStart) 
+	(setMethodCodeStart): Replace struct _jitCodeHeader
+	by jitCodeHeader, which is then suitably defined in 
+	each engine.
+
+	* kaffe/kaffevm/intrp/machine.h: Define jitCodeHeader type
+	to fix compiler warning.
+
+	* kaffe/kaffevm/classMethod.h: Use jitCodeHeader instead of
+	struct _jitCodeHeader.
+
+2006-04-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/jit3/machine.c (installMethodCode),
 	kaffe/kaffevm/jit/machine.c (installMethodCode) 
 	(installMethodCode),
Index: kaffe/kaffe/kaffevm/classMethod.c
diff -u kaffe/kaffe/kaffevm/classMethod.c:1.156 kaffe/kaffe/kaffevm/classMethod.c:1.157
--- kaffe/kaffe/kaffevm/classMethod.c:1.156	Sat Apr 22 23:42:06 2006
+++ kaffe/kaffe/kaffevm/classMethod.c	Sun Apr 23 01:32:12 2006
@@ -16,6 +16,7 @@
 #include "config-hacks.h"
 #include "defs.h"
 #include "gtypes.h"
+#include "machine.h"
 #include "slots.h"
 #include "access.h"
 #include "object.h"
@@ -2050,7 +2051,7 @@
  * @param method a method
  * @return pointer to start of code
  */
-struct _jitCodeHeader*
+jitCodeHeader*
 getMethodCodeStart(Method * method) 
 {
   return method->c.ncode.ncode_start;
@@ -2063,7 +2064,7 @@
  * @param start pointer to start of code
  */
 void
-setMethodCodeStart(Method * method, struct _jitCodeHeader* start)
+setMethodCodeStart(Method * method, jitCodeHeader* start)
 {
   method->c.ncode.ncode_start = start;
 }
Index: kaffe/kaffe/kaffevm/classMethod.h
diff -u kaffe/kaffe/kaffevm/classMethod.h:1.89 kaffe/kaffe/kaffevm/classMethod.h:1.90
--- kaffe/kaffe/kaffevm/classMethod.h:1.89	Mon Apr 17 17:57:07 2006
+++ kaffe/kaffe/kaffevm/classMethod.h	Sun Apr 23 01:32:12 2006
@@ -13,6 +13,7 @@
 #define __classmethod_h
 
 #include "gtypes.h"
+#include "machine.h"
 #include "access.h"
 #include "object.h"
 #include "md.h"	 /* XXX: need this here so KAFFE_PROFILER is accurately def'd */
@@ -45,7 +46,6 @@
 struct _classEntry;
 struct _innerClass;
 struct Hjava_lang_String;
-struct _jitCodeHeader;
 
 #include <java_lang_ClassLoader.h>
 #include "reference.h"
@@ -221,7 +221,7 @@
  * @param method a method
  * @return pointer to start of code
  */
-struct _jitCodeHeader* getMethodCodeStart(Method * method);
+jitCodeHeader* getMethodCodeStart(Method * method);
 
 /**
  * Set start of native code of a method
@@ -229,7 +229,7 @@
  * @param method a method
  * @param start pointer to start of code
  */
-void setMethodCodeStart(Method * method, struct _jitCodeHeader* start);
+void setMethodCodeStart(Method * method, jitCodeHeader* start);
 
 #define	_SET_METHOD_NATIVECODE(M, C)	do {\
 	if ((M)->idx == -1) {\
@@ -320,7 +320,7 @@
 	nativecode*		ncode;
 	union {
 	  struct {
-		struct _jitCodeHeader*	ncode_start;
+		jitCodeHeader*	ncode_start;
 		nativecode*	ncode_end;
 	  } ncode;
 	  struct {
Index: kaffe/kaffe/kaffevm/intrp/machine.h
diff -u kaffe/kaffe/kaffevm/intrp/machine.h:1.14 kaffe/kaffe/kaffevm/intrp/machine.h:1.15
--- kaffe/kaffe/kaffevm/intrp/machine.h:1.14	Thu Apr  6 01:39:10 2006
+++ kaffe/kaffe/kaffevm/intrp/machine.h	Sun Apr 23 01:32:12 2006
@@ -11,6 +11,7 @@
 #ifndef __machine_h
 #define	__machine_h
 
+#include "gtypes.h"
 #include "object.h"
 #include "threadData.h"
 
@@ -112,6 +113,9 @@
 
 struct _jmethodID;
 struct _slots;
+
+typedef nativecode jitCodeHeader;
+
 void virtualMachine(struct _jmethodID*, struct _slots*, struct _slots*, threadData*); 
 void setupExceptionHandling(VmExceptHandler* eh, struct _jmethodID* meth, struct Hjava_lang_Object* syncobj, threadData*);
 void cleanupExceptionHandling(VmExceptHandler* eh, threadData*);