Merged branch subtype-trunk into default.

[cacao.git] / src / vm / jit / i386 / md-abi.c

diff --git a/src/vm/jit/i386/md-abi.c b/src/vm/jit/i386/md-abi.c
index bcf60e65ff95be71ef5decc153a575ec8972d40e..f304686bc70606edb2980a96ee3be4440365bfe5 100644 (file)
--- a/src/vm/jit/i386/md-abi.c
+++ b/src/vm/jit/i386/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/i386/md-abi.c - functions for i386 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-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,14 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Ullrich
-
-   Changes: Christian Thalinger
-
-   $Id: md-abi.c 5115 2006-07-12 14:55:04Z twisti $
-
 */
 
 
@@ -38,8 +28,9 @@
 
 #include "vm/jit/i386/md-abi.h"
 
-#include "vm/descriptor.h"
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
+
 #include "vm/jit/abi.h"
 
 
@@ -50,6 +41,24 @@ s4 nregdescint[] = {
     REG_END
 };
 
+const char *abi_registers_integer_name[] = {
+       "eax", "ecx", "edx", "ebx", "esp", "ebp", "esi", "edi"
+};
+
+const s4 abi_registers_integer_argument[] = {
+       -1,
+};
+
+const s4 abi_registers_integer_saved[] = {
+       5, /* s0 */
+       6, /* s1 */
+       7, /* s2 */
+};
+
+const s4 abi_registers_integer_temporary[] = {
+       3, /* t0 */
+};
+
 
 s4 nregdescfloat[] = {
  /* rounding problems with callee saved registers */
@@ -59,6 +68,18 @@ s4 nregdescfloat[] = {
     REG_END
 };
 
+const s4 abi_registers_float_argument[] = {
+       -1,
+};
+
+const s4 abi_registers_float_saved[] = {
+       -1,
+};
+
+const s4 abi_registers_float_temporary[] = {
+       -1,
+};
+
 
 /* md_param_alloc **************************************************************
 
@@ -80,19 +101,48 @@ s4 nregdescfloat[] = {
 void md_param_alloc(methoddesc *md)
 {
        paramdesc *pd;
-       s4        stacksize;
-       s4        i;
+       int        stacksize;
+       int        i;
 
        pd = md->params;
        stacksize = 0;
 
        for (i = 0; i < md->paramcount; i++, pd++) {
                pd->inmemory = true;
-               pd->regoff = stacksize;
-               stacksize += IS_2_WORD_TYPE(md->paramtypes[i].type) ? 2 : 1;
+               pd->index    = stacksize;
+               pd->regoff   = stacksize * 8;
+               stacksize++;
+       }
+
+       md->memuse       = stacksize;
+       md->argintreguse = 0;
+       md->argfltreguse = 0;
+}
+
+
+/* md_param_alloc_native *******************************************************
+
+   Pre-allocate arguments according the native ABI.
+
+*******************************************************************************/
+
+void md_param_alloc_native(methoddesc *md)
+{
+       paramdesc *pd;
+       int        stacksize;
+       int        i;
+
+       pd = md->params;
+       stacksize = 0;
+
+       for (i = 0; i < md->paramcount; i++, pd++) {
+               pd->inmemory  = true;
+               pd->index     = stacksize;
+               pd->regoff    = stacksize * 4;
+               stacksize    += IS_2_WORD_TYPE(md->paramtypes[i].type) ? 2 : 1;
        }
 
-       md->memuse = stacksize;
+       md->memuse       = stacksize;
        md->argintreguse = 0;
        md->argfltreguse = 0;
 }
@@ -106,7 +156,7 @@ void md_param_alloc(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(jitdata *jd, stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackelement_t *stackslot)
 {
        /* nothing */
 }