New source tree.

diff --git a/src/vm/jit/alpha/Makefile.am b/src/vm/jit/alpha/Makefile.am
index 1484628df6cd5e6e33179d8d09bf580cba6f59c9..d8084946f983445ca261332f8571b6566f4d4c07 100644 (file)
--- a/src/vm/jit/alpha/Makefile.am
+++ b/src/vm/jit/alpha/Makefile.am
@@ -1,9 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1467 2004-11-08 13:13:00Z twisti $
+# $Id: Makefile.am 1624 2004-11-30 14:49:45Z twisti $
 
-
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir)/src
 
 EXTRA_DIST = \
        asmpart.S \
@@ -17,14 +16,16 @@ EXTRA_DIST = \
 
 noinst_LIBRARIES = libarch.a
 
-libarch_a_SOURCES = asmpart.S codegen.c disass.c
+libarch_a_SOURCES = \
+       asmpart.S \
+       codegen.c \
+       disass.c
 
 asmpart.o: asmpart.S $(top_srcdir)/config.h offsets.h
        $(COMPILE) -c $<
 
-offsets.h: $(top_srcdir)/config.h $(top_srcdir)/global.h $(top_srcdir)/threads/thread.h
-       $(COMPILE) -o $(top_srcdir)/genoffsets $(top_srcdir)/genoffsets.c
-       $(top_srcdir)/genoffsets > offsets.h
+offsets.h: $(top_srcdir)/config.h $(top_srcdir)/src/vm/global.h $(top_srcdir)/src/threads/native/threads.h
+       $(top_srcdir)/src/vm/jit/tools/genoffsets > offsets.h
 
 
 ## Local variables:

diff --git a/src/vm/jit/alpha/arch.h b/src/vm/jit/alpha/arch.h
index befa2776ab198cae02fe2879818558b7d2910aec..420a928b481a94e0bd1e9d12cad6cac38565b4a3 100644 (file)
--- a/src/vm/jit/alpha/arch.h
+++ b/src/vm/jit/alpha/arch.h
@@ -1,4 +1,4 @@
-/* jit/alpha/arch.h - architecture defines for Alpha
+/* vm/jit/alpha/arch.h - architecture defines for Alpha
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
@@ -26,7 +26,7 @@
 
    Authors: Christian Thalinger
 
-   $Id: arch.h 1586 2004-11-24 14:27:03Z twisti $
+   $Id: arch.h 1624 2004-11-30 14:49:45Z twisti $
 
 */
 

diff --git a/src/vm/jit/alpha/asmpart.S b/src/vm/jit/alpha/asmpart.S
index 5d452fdabcbb35ed7f86f2660a2526d9211fd10c..0df624481510e237b2a7bbe5bd93af4834df5d89 100644 (file)
--- a/src/vm/jit/alpha/asmpart.S
+++ b/src/vm/jit/alpha/asmpart.S
@@ -1,4 +1,4 @@
-/* jit/alpha/asmpart.S - Java-C interface functions for alpha
+/* vm/jit/alpha/asmpart.S - Java-C interface functions for alpha
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -28,13 +28,13 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: asmpart.S 1595 2004-11-25 15:49:48Z twisti $
+   $Id: asmpart.S 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
 
 #include "config.h"        
-#include "offsets.h"
+#include "vm/jit/alpha/offsets.h"
 
 
 #define        MethodPointer   -8

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index b19269bd01210f927f24ab4cd0aaf54b147b3290..04d257aa7d43e82b4015a082aba7fe6129f182e3 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -1,4 +1,4 @@
-/* jit/alpha/codegen.c - machine code generator for alpha
+/* vm/jit/alpha/codegen.c - machine code generator for alpha
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -28,28 +28,27 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.c 1606 2004-11-29 10:06:44Z twisti $
+   $Id: codegen.c 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
 
-#include "global.h"
 #include <stdio.h>
 #include <signal.h>
-#include "types.h"
-#include "main.h"
-#include "jit/alpha/codegen.h"
-#include "jit/jit.h"
-#include "jit/parse.h"
-#include "jit/reg.h"
-#include "jit/lsra.h"
-#include "builtin.h"
-#include "asmpart.h"
-#include "jni.h"
-#include "loader.h"
-#include "tables.h"
-#include "native.h"
-#include "main.h"
+
+#include "native/native.h"
+#include "vm/builtin.h"
+#include "vm/global.h"
+#include "vm/loader.h"
+#include "vm/tables.h"
+#include "vm/jit/asmpart.h"
+#include "vm/jit/jit.h"
+#include "vm/jit/lsra.h"
+#include "vm/jit/parse.h"
+#include "vm/jit/reg.h"
+#include "vm/jit/alpha/codegen.h"
+#include "vm/jit/alpha/arch.h"
+#include "vm/jit/alpha/types.h"
 
 
 /* *****************************************************************************
@@ -105,14 +104,13 @@ int nregdescfloat[] = {
        REG_TMP, REG_TMP, REG_TMP, REG_TMP, REG_RES, REG_RES, REG_RES, REG_RES,
        REG_END };
 
-/* for use of reserved registers, see comment above */
 
-/* include independent code generation stuff -- include after register        */
-/* descriptions to avoid extern definitions                                   */
+/* Include independent code generation stuff -- include after register        */
+/* descriptions to avoid extern definitions.                                  */
 
-#include "jit/codegen.inc"
-#include "jit/reg.inc"
-#include "jit/lsra.inc"
+#include "vm/jit/codegen.inc"
+#include "vm/jit/reg.inc"
+#include "vm/jit/lsra.inc"
 
 
 /* NullPointerException handlers and exception handling initialisation        */

diff --git a/src/vm/jit/alpha/codegen.h b/src/vm/jit/alpha/codegen.h
index 078bf228a0b4db7ebe16c555ea21a6a8b343f82f..4f43179bc81a5cdc828146b13fdc0934b86dff5c 100644 (file)
--- a/src/vm/jit/alpha/codegen.h
+++ b/src/vm/jit/alpha/codegen.h
@@ -1,4 +1,4 @@
-/* jit/alpha/codegen.h - code generation macros and definitions for alpha
+/* vm/jit/alpha/codegen.h - code generation macros and definitions for alpha
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -28,7 +28,7 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: codegen.h 1595 2004-11-25 15:49:48Z twisti $
+   $Id: codegen.h 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
@@ -38,8 +38,6 @@
 
 #include <ucontext.h>
 
-#include "jit/jit.h"
-
 
 /* additional functions and macros to generate code ***************************/
 

diff --git a/src/vm/jit/alpha/disass.c b/src/vm/jit/alpha/disass.c
index 73a3cb4bd2e6f8b230e74ceb3aa353ae481f62aa..bf02916580dc5cbbd9f25fa9c9c878bbd960d30f 100644 (file)
--- a/src/vm/jit/alpha/disass.c
+++ b/src/vm/jit/alpha/disass.c
@@ -1,4 +1,4 @@
-/* jit/alpha/disass.c - primitive disassembler for alpha machine code
+/* vm/jit/alpha/disass.c - primitive disassembler for alpha machine code
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -28,13 +28,15 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: disass.c 1062 2004-05-16 13:47:03Z twisti $
+   $Id: disass.c 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
 
 #include <stdio.h>
-#include "disass.h"
+
+#include "vm/jit/alpha/disass.h"
+
 
 /*  The disassembler uses two tables for decoding the instructions. The first
        table (ops) is used to classify the instructions based on the op code and

diff --git a/src/vm/jit/alpha/disass.h b/src/vm/jit/alpha/disass.h
index 5c11a02666d1ce9a5289b39852372e368c395dec..154b490c70e6fabb4f30f1a83224e21a133cd7d2 100644 (file)
--- a/src/vm/jit/alpha/disass.h
+++ b/src/vm/jit/alpha/disass.h
@@ -1,4 +1,4 @@
-/* alpha/disass.h - disassembler header
+/* vm/jit/alpha/disass.h - disassembler header
 
    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 1062 2004-05-16 13:47:03Z twisti $
+   $Id: disass.h 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
@@ -35,17 +35,18 @@
 #ifndef _DISASS_H
 #define _DISASS_H
 
-#include "types.h"
+#include "vm/jit/alpha/types.h"
 
 
 extern char *regs[];
 
 
-/* function prototypes */
+/* function prototypes ********************************************************/
+
 void disassinstr(s4 *code, int pos);
 void disassemble(s4 *code, int len);
 
-#endif
+#endif /* _DISASS_H */
 
 
 /*

diff --git a/src/vm/jit/alpha/types.h b/src/vm/jit/alpha/types.h
index 15f5eaa4cf45fea6d393f855fcd97331b8aa47f3..958bd1705754bb3757778e7c4b393edae6b19f9e 100644 (file)
--- a/src/vm/jit/alpha/types.h
+++ b/src/vm/jit/alpha/types.h
@@ -1,4 +1,4 @@
-/* jit/alpha/types.h - machine specific definitions for alpha
+/* vm/jit/alpha/types.h - machine specific definitions for alpha
 
    Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
    Institut f. Computersprachen, TU Wien
@@ -29,7 +29,7 @@
             Andreas  Krall
             Michael Gschwind
 
-   $Id: types.h 1587 2004-11-24 14:27:44Z twisti $
+   $Id: types.h 1624 2004-11-30 14:49:45Z twisti $
 
 */
 
@@ -37,7 +37,7 @@
 #ifndef _TYPES_H
 #define _TYPES_H
 
-#include "jit/alpha/arch.h"
+#include "vm/jit/alpha/arch.h"
 
 
 /* Define the sizes of the integer types used internally by cacao. */