Further changes.

diff --git a/jit/i386/disass.h b/jit/i386/disass.h
index a16bf665471959d61108523697d85abe33606551..6e09ab11531e1c556a4ed0e43c6a33c36402a562 100644 (file)
--- a/jit/i386/disass.h
+++ b/jit/i386/disass.h
@@ -1,4 +1,4 @@
-/* i386/disass.h - wrapper functions for GNU binutils disassembler
+/* jit/i386/disass.h - wrapper functions for GNU binutils disassembler
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: disass.h 557 2003-11-02 22:51:59Z twisti $
+   $Id: disass.h 562 2003-11-03 00:34:34Z twisti $
 
 */
 

diff --git a/jit/parse.c b/jit/parse.c
index baf6147853694b1e45ec0a544b98c025d8138b55..02466aba3dd79eaeeb69d929a8b926a263c572f8 100644 (file)
--- a/jit/parse.c
+++ b/jit/parse.c
@@ -28,7 +28,7 @@
 
    Changes: Carolyn Oates
 
-   $Id: parse.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: parse.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
@@ -630,7 +630,7 @@ void parse()
                opcode = code_get_u1(p);            /* fetch op code                  */
 
          
-               if (opt_rt && (pOpcodes == 2) || (pOpcodes == 3)) {
+               if (opt_rt && (pOpcodes == 2 || pOpcodes == 3)) {
                        printf("Parse<%i> p=%i<%i<   opcode=<%i> %s\n",
                                   pOpcodes, p, rt_jcodelength, opcode, icmd_names[opcode]);
                }

diff --git a/jit/parseRTstats.h b/jit/parseRTstats.h
index 2a3167ce7b02e852590f9a643957593d360cfd0f..140df3897774a70cd379eb3b59d6712ff1f9d4ac 100644 (file)
--- a/jit/parseRTstats.h
+++ b/jit/parseRTstats.h
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRTstats.h 557 2003-11-02 22:51:59Z twisti $
+   $Id: parseRTstats.h 562 2003-11-03 00:34:34Z twisti $
 
 */
 
@@ -38,6 +38,10 @@ extern int unRTclassHeirCnt;
 extern int unRTmethodCnt;
 extern int pWhenMarked;
 
+
+/* function prototypes */
+void printObjectClassHeirarchy1();
+
 #endif /* _PARSERTSTATS_H */
 
 

diff --git a/loader.c b/loader.c
index a13cd4ed9eda8bb2d4693f3cb2ceff454b2061f4..eeb40351b2588e3e8d5f75f473379c34497f25db 100644 (file)
--- a/loader.c
+++ b/loader.c
@@ -30,13 +30,14 @@
             Roman Obermaiser
             Mark Probst
 
-   $Id: loader.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: loader.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
 
+#include <string.h>
 #include <assert.h>
-
+#include <sys/stat.h>
 #include "global.h"
 #include "loader.h"
 #include "native.h"
@@ -44,13 +45,10 @@
 #include "builtin.h"
 #include "jit.h"
 #include "asmpart.h"
-
 #include "toolbox/memory.h"
-
 #include "toolbox/loging.h"
-
 #include "threads/thread.h"
-#include <sys/stat.h>
+
 
 /* global variables ***********************************************************/
 

diff --git a/main.c b/main.c
index bb08526da2d1156e5d9dbbe956dab52f5631f8b6..520ce546c28e65390a6e8182f8661259a5695ad5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -37,12 +37,13 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: main.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: main.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
 
 #include <stdlib.h>
+#include <string.h>
 #include "global.h"
 #include "tables.h"
 #include "loader.h"
@@ -50,8 +51,10 @@
 #include "asmpart.h"
 #include "builtin.h"
 #include "native.h"
+#include "mm/boehm.h"
 #include "threads/thread.h"
 #include "toolbox/loging.h"
+#include "toolbox/memory.h"
 #include "parseRTstats.h"
 
 

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 24e2af7f74ff985a3d684fe7e448c613b91b8177..fcea6247c9115b8f7c5b9fb4f6f94c21da9f79ae 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -37,12 +37,13 @@
      - Calling the class loader
      - Running the main method
 
-   $Id: cacao.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: cacao.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
 
 #include <stdlib.h>
+#include <string.h>
 #include "global.h"
 #include "tables.h"
 #include "loader.h"
@@ -50,8 +51,10 @@
 #include "asmpart.h"
 #include "builtin.h"
 #include "native.h"
+#include "mm/boehm.h"
 #include "threads/thread.h"
 #include "toolbox/loging.h"
+#include "toolbox/memory.h"
 #include "parseRTstats.h"
 
 

diff --git a/src/vm/jit/i386/disass.h b/src/vm/jit/i386/disass.h
index a16bf665471959d61108523697d85abe33606551..6e09ab11531e1c556a4ed0e43c6a33c36402a562 100644 (file)
--- a/src/vm/jit/i386/disass.h
+++ b/src/vm/jit/i386/disass.h
@@ -1,4 +1,4 @@
-/* i386/disass.h - wrapper functions for GNU binutils disassembler
+/* jit/i386/disass.h - wrapper functions for GNU binutils disassembler
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -27,7 +27,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: disass.h 557 2003-11-02 22:51:59Z twisti $
+   $Id: disass.h 562 2003-11-03 00:34:34Z twisti $
 
 */
 

diff --git a/src/vm/jit/inline/parseRTstats.h b/src/vm/jit/inline/parseRTstats.h
index 2a3167ce7b02e852590f9a643957593d360cfd0f..140df3897774a70cd379eb3b59d6712ff1f9d4ac 100644 (file)
--- a/src/vm/jit/inline/parseRTstats.h
+++ b/src/vm/jit/inline/parseRTstats.h
@@ -26,7 +26,7 @@
 
    Authors: Carolyn Oates
 
-   $Id: parseRTstats.h 557 2003-11-02 22:51:59Z twisti $
+   $Id: parseRTstats.h 562 2003-11-03 00:34:34Z twisti $
 
 */
 
@@ -38,6 +38,10 @@ extern int unRTclassHeirCnt;
 extern int unRTmethodCnt;
 extern int pWhenMarked;
 
+
+/* function prototypes */
+void printObjectClassHeirarchy1();
+
 #endif /* _PARSERTSTATS_H */
 
 

diff --git a/src/vm/jit/parse.c b/src/vm/jit/parse.c
index baf6147853694b1e45ec0a544b98c025d8138b55..02466aba3dd79eaeeb69d929a8b926a263c572f8 100644 (file)
--- a/src/vm/jit/parse.c
+++ b/src/vm/jit/parse.c
@@ -28,7 +28,7 @@
 
    Changes: Carolyn Oates
 
-   $Id: parse.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: parse.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
@@ -630,7 +630,7 @@ void parse()
                opcode = code_get_u1(p);            /* fetch op code                  */
 
          
-               if (opt_rt && (pOpcodes == 2) || (pOpcodes == 3)) {
+               if (opt_rt && (pOpcodes == 2 || pOpcodes == 3)) {
                        printf("Parse<%i> p=%i<%i<   opcode=<%i> %s\n",
                                   pOpcodes, p, rt_jcodelength, opcode, icmd_names[opcode]);
                }

diff --git a/src/vm/loader.c b/src/vm/loader.c
index a13cd4ed9eda8bb2d4693f3cb2ceff454b2061f4..eeb40351b2588e3e8d5f75f473379c34497f25db 100644 (file)
--- a/src/vm/loader.c
+++ b/src/vm/loader.c
@@ -30,13 +30,14 @@
             Roman Obermaiser
             Mark Probst
 
-   $Id: loader.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: loader.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
 
+#include <string.h>
 #include <assert.h>
-
+#include <sys/stat.h>
 #include "global.h"
 #include "loader.h"
 #include "native.h"
@@ -44,13 +45,10 @@
 #include "builtin.h"
 #include "jit.h"
 #include "asmpart.h"
-
 #include "toolbox/memory.h"
-
 #include "toolbox/loging.h"
-
 #include "threads/thread.h"
-#include <sys/stat.h>
+
 
 /* global variables ***********************************************************/
 

diff --git a/src/vm/tables.c b/src/vm/tables.c
index a9e6bd7eef45d33c78d3ba06c2b778507001272f..bbe2f1fe5cc147b2aba959e631ae88a614d359c4 100644 (file)
--- a/src/vm/tables.c
+++ b/src/vm/tables.c
@@ -35,11 +35,11 @@
        - the heap
        - additional support functions
 
-   $Id: tables.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: tables.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
-
+#include <string.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/mman.h>

diff --git a/tables.c b/tables.c
index a9e6bd7eef45d33c78d3ba06c2b778507001272f..bbe2f1fe5cc147b2aba959e631ae88a614d359c4 100644 (file)
--- a/tables.c
+++ b/tables.c
@@ -35,11 +35,11 @@
        - the heap
        - additional support functions
 
-   $Id: tables.c 557 2003-11-02 22:51:59Z twisti $
+   $Id: tables.c 562 2003-11-03 00:34:34Z twisti $
 
 */
 
-
+#include <string.h>
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/mman.h>