* src/vmcore/descriptor.c (vm/jit/abi.h): Added.

* src/vmcore/descriptor.h (md_param_alloc): Removed.

* src/vm/jit/abi.h (abi_registers_integer_name)
(abi_registers_integer_argument, abi_registers_integer_saved)
(abi_registers_integer_temporary, abi_registers_float_name)
(abi_registers_float_argument, abi_registers_float_saved)
(abi_registers_float_temporary): Added.
(md_param_alloc): Likewise.
(md_param_alloc_native): Likewise.

diff --git a/src/vm/jit/abi.h b/src/vm/jit/abi.h
index a28d936f39eab7cd6d61000da8eeb0cde0cfef07..8d80e7b60c09f3c42e6a63fb1155e8ca6f1bdd92 100644 (file)
--- a/src/vm/jit/abi.h
+++ b/src/vm/jit/abi.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: abi.h 7246 2007-01-29 18:49:05Z twisti $
+   $Id: abi.h 7329 2007-02-11 21:24:14Z twisti $
 
 */
 
@@ -43,9 +43,23 @@ extern s4 nregdescint[];
 extern char *regs[];
 extern s4 nregdescfloat[];
 
+extern const char *abi_registers_integer_name[];
+extern const s4    abi_registers_integer_argument[];
+extern const s4    abi_registers_integer_saved[];
+extern const s4    abi_registers_integer_temporary[];
+
+extern const char *abi_registers_float_name[];
+extern const s4    abi_registers_float_argument[];
+extern const s4    abi_registers_float_saved[];
+extern const s4    abi_registers_float_temporary[];
+
 
 /* function prototypes ********************************************************/
 
+/* machine dependent descriptor function */
+void md_param_alloc(methoddesc *md);
+void md_param_alloc_native(methoddesc *md);
+
 /* machine dependent return value handling function */
 void md_return_alloc(jitdata *jd, stackptr stackslot);
 

diff --git a/src/vmcore/descriptor.c b/src/vmcore/descriptor.c
index 4b1c0e81537aa3cfaac05b3a770976cee52ea5e6..83f1a0c4942feb7636a6c652c98c4d7212c64fb8 100644 (file)
--- a/src/vmcore/descriptor.c
+++ b/src/vmcore/descriptor.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: descriptor.c 7246 2007-01-29 18:49:05Z twisti $
+   $Id: descriptor.c 7329 2007-02-11 21:24:14Z twisti $
 
 */
 
@@ -39,6 +39,8 @@
 
 #include "vm/exceptions.h"
 
+#include "vm/jit/abi.h"
+
 #include "vmcore/descriptor.h"
 #include "vmcore/options.h"
 #include "vmcore/resolve.h"

diff --git a/src/vmcore/descriptor.h b/src/vmcore/descriptor.h
index 5ea3e2e3d80f5f8b01ccca84d1cdefa0a8229bf7..294429cf8c1bc144c0c912d7c521e237fd43b786 100644 (file)
--- a/src/vmcore/descriptor.h
+++ b/src/vmcore/descriptor.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: descriptor.h 7246 2007-01-29 18:49:05Z twisti $
+   $Id: descriptor.h 7329 2007-02-11 21:24:14Z twisti $
 
 */
 
@@ -178,9 +178,6 @@ void descriptor_debug_print_paramdesc(FILE *file,paramdesc *d);
 void descriptor_pool_debug_dump(descriptor_pool *pool, FILE *file);
 #endif /* !defined(NDEBUG) */
 
-/* machine dependent descriptor function */
-void md_param_alloc(methoddesc *md);
-
 #endif /* _DESCRIPTOR_H */