X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fs390%2Fmd-abi.h;h=5d25d2037f509ebd4b178cb59f137b575c3ab2cb;hb=e9865924b9bb241082f2b3878f893be3fc8b57c2;hp=ff0bcba699e25a07abc1cbeaf55108386ea2e4db;hpb=5ccd3e5a47a5de8712cf02f233edaeff05a86637;p=cacao.git

diff --git a/src/vm/jit/s390/md-abi.h b/src/vm/jit/s390/md-abi.h
index ff0bcba69..5d25d2037 100644
--- a/src/vm/jit/s390/md-abi.h
+++ b/src/vm/jit/s390/md-abi.h
@@ -1,9 +1,7 @@
-/* src/vm/jit/x86_64/md-abi.h - defines for x86_64 Linux ABI
+/* src/vm/jit/s390/md-abi.h - defines for s390 Linux ABI
 
-   Copyright (C) 1996-2005, 2006 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
+   Copyright (C) 1996-2010
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,62 +20,12 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: md-abi.h 7486 2007-03-08 13:50:07Z twisti $
-
 */
 
 
 #ifndef _MD_ABI_H
 #define _MD_ABI_H
 
-/* keep old code happy */
-
-#define RIP    -1
-#define RAX    0
-#define RCX    1
-#define RDX    2
-#define RBX    3
-#define RSP    4
-#define RBP    5
-#define RSI    6
-#define RDI    7
-#define R8     8
-#define R9     9
-#define R10    10
-#define R11    11
-#define R12    12
-#define R13    13
-#define R14    14
-#define R15    15
-
-
-#define XMM0   0
-#define XMM1   1
-#define XMM2   2
-#define XMM3   3
-#define XMM4   4
-#define XMM5   5
-#define XMM6   6
-#define XMM7   7
-#define XMM8   8
-#define XMM9   9
-#define XMM10  10
-#define XMM11  11
-#define XMM12  12
-#define XMM13  13
-#define XMM14  14
-#define XMM15  15
-
-
-#define REG_IFTMP       10   /* temporary integer and floating point register */
-
-
 /* define registers ***********************************************************/
 
 #define R0     0
@@ -122,20 +70,25 @@
 #define REG_RESULT2     R3
 
 #define REG_ITMP1       R1      /* temporary register                        */
-#define REG_ITMP2       R12     /* temporary register and method pointer     */
-#define REG_ITMP3       R14     /* temporary register                        */
+#define REG_ITMP2       R14     /* temporary register and method pointer     */
+#define REG_ITMP3       R0      /* temporary register                        */
+
+#define IS_REG_ITMP(x) (((x) == REG_ITMP1) || ((x) == REG_ITMP2) || ((x) == REG_ITMP3))
 
 #define REG_ITMP12_PACKED    PACK_REGS(REG_ITMP2, REG_ITMP1)
 #define REG_ITMP23_PACKED    PACK_REGS(REG_ITMP3, REG_ITMP2)
+#define REG_ITMP13_PACKED    PACK_REGS(REG_ITMP3, REG_ITMP1)
+/* even odd */
+#define REG_ITMP31_PACKED    PACK_REGS(REG_ITMP1, REG_ITMP3)
 #define REG_RESULT_PACKED    PACK_REGS(REG_RESULT2, REG_RESULT)
 
-#define REG_METHODPTR   REG_ITMP2/* pointer to the place from where the       */
+#define REG_METHODPTR   REG_ITMP1/* pointer to the place from where the       */
                                  /* procedure vector has been fetched         */
 
 #define REG_NULL        -1       /* used for reg_of_var where d is not needed */
 
-#define REG_ITMP1_XPTR  REG_ITMP1/* exception pointer = temporary register 1  */
-#define REG_ITMP2_XPC   REG_ITMP2/* exception pc = temporary register 2       */
+#define REG_ITMP1_XPTR  REG_ITMP3/* exception pointer = temporary register 3  */
+#define REG_ITMP2_XPC   REG_ITMP1/* exception pc = temporary register 1       */
 
 #define REG_SP          R15      /* stack pointer                             */
 #define REG_RA          R14      /* same as itmp3 */
@@ -155,37 +108,22 @@
 
 #define REG_FRESULT     F0       /* to deliver floating point method results  */
 
-#define REG_FTMP1       F1       /* temporary floating point register         */
-#define REG_FTMP2       F3       /* temporary floating point register         */
-#define REG_FTMP3       F5       /* temporary floating point register         */
-
-#define __REG_IFTMP       10       /* temporary integer and floating point register */
+#define REG_FTMP1       F4       /* temporary floating point register         */
+#define REG_FTMP2       F6       /* temporary floating point register         */
 
+/* No ftmp3 */
 
 #define INT_REG_CNT     16       /* number of integer registers               */
-#define INT_SAV_CNT     5        /* number of integer callee saved registers  */
+#define INT_SAV_CNT     6        /* number of integer callee saved registers  */
 #define INT_ARG_CNT     5        /* number of integer argument registers      */
-#define INT_TMP_CNT     1        /* number of integer temporary registers     */
+#define INT_TMP_CNT     0        /* number of integer temporary registers     */
 #define INT_RES_CNT     5        /* number of integer reserved registers      */
 
 #define FLT_REG_CNT     16       /* number of float registers                 */
-#define FLT_SAV_CNT     2        /* number of float callee saved registers    */
+#define FLT_SAV_CNT     0        /* number of float callee saved registers    */
 #define FLT_ARG_CNT     2        /* number of float argument registers        */
-#define FLT_TMP_CNT     12        /* number of float temporary registers       */
-#define FLT_RES_CNT     0        /* number of float reserved registers        */
-
-#define TRACE_ARGS_NUM  8
-
-
-
-
-
-
-
-
-
-
-
+#define FLT_TMP_CNT     12       /* number of float temporary registers       */
+#define FLT_RES_CNT     2        /* number of float reserved registers        */
 
 #endif /* _MD_ABI_H */