X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fx86_64%2Ftypes.h;h=57f01737d3d774b0d3ee1441e7a1f8a5191f6467;hb=410d4924fc0ccadc421173e6b959856e28815982;hp=0ad9e85189e1a6ba9fe88f69adb0a2441fe7ca18;hpb=39a1bf4c124dacac73d5375d0fd08eb6df4518cf;p=cacao.git

diff --git a/src/vm/jit/x86_64/types.h b/src/vm/jit/x86_64/types.h
index 0ad9e8518..57f01737d 100644
--- a/src/vm/jit/x86_64/types.h
+++ b/src/vm/jit/x86_64/types.h
@@ -1,46 +1,43 @@
-/* x86_64/types.h **************************************************************
+/* jit/x86_64/types.h - cacao types for x86_64
 
-    Copyright (c) 1997 A. Krall, R. Grafl, M. Gschwind, M. Probst
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
-    See file COPYRIGHT for information on usage and disclaimer of warranties
+   This file is part of CACAO.
 
-    Machine specific definitions for the x86_64 processor
-	
-    Authors: Reinhard Grafl      EMAIL: cacao@complang.tuwien.ac.at
-             Andreas  Krall      EMAIL: cacao@complang.tuwien.ac.at
-             Michael Gschwind    EMAIL: cacao@complang.tuwien.ac.at
-             Christian Thalinger EMAIL: cacao@complang.tuwien.ac.at
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2, or (at
+   your option) any later version.
 
-    Last Change: $Id: types.h 559 2003-11-02 23:20:06Z twisti $
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
 
-*******************************************************************************/
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
 
-#ifndef _CACAO_TYPES_H
-#define _CACAO_TYPES_H
+   Contact: cacao@complang.tuwien.ac.at
+
+   Authors: Christian Thalinger
 
-#define POINTERSIZE         8
-#define WORDS_BIGENDIAN     0
+   $Id: types.h 1735 2004-12-07 14:33:27Z twisti $
 
-#define SUPPORT_DIVISION    1
-#define SUPPORT_LONG        1
-#define SUPPORT_FLOAT       1
-#define SUPPORT_DOUBLE      1
+*/
 
-#define SUPPORT_LONG_ADD    1
-#define SUPPORT_LONG_CMP    1
-#define SUPPORT_LONG_LOG    1
-#define SUPPORT_LONG_SHIFT  1
-#define SUPPORT_LONG_MULDIV 1
-#define SUPPORT_LONG_ICVT   1
-#define SUPPORT_LONG_FCVT   1
 
-#define CONDITIONAL_LOADCONST
-#define NO_DIV_OPT
-#define CONSECUTIVE_INTARGS
-#define CONSECUTIVE_FLOATARGS
+#ifndef _CACAO_TYPES_H
+#define _CACAO_TYPES_H
+
+#include "vm/jit/x86_64/arch.h"
 
-#define U8_AVAILABLE        1
 
+/* define the sizes of the integer types used internally by cacao */
 
 typedef signed char             s1;
 typedef unsigned char           u1;
@@ -59,4 +56,23 @@ typedef struct {u4 low, high;}  u8;
 #define s8 u8
 #endif
 
-#endif
+
+/* define size of a function pointer used in function pointer casts */
+
+typedef u8                      ptrint;
+
+#endif /* _CACAO_TYPES_H */
+
+
+/*
+ * These are local overrides for various environment variables in Emacs.
+ * Please do not remove this and leave it at the end of the file, where
+ * Emacs will automagically detect them.
+ * ---------------------------------------------------------------------
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: t
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */