asm_ defines for f2i conversions.

diff --git a/builtin.c b/builtin.c
index 021e218ecbf0d4f3b70329bfcfb291f594e3dae9..2c4f6b8b7ffc506d491627192ba745b2cd9f96eb 100644 (file)
--- a/builtin.c
+++ b/builtin.c
@@ -111,10 +111,14 @@ builtin_descriptor builtin_desc[] = {
        {(functionptr) builtin_l2f,                                "l2f"},
        {(functionptr) builtin_l2d,                                "l2d"},
        {(functionptr) builtin_f2i,                                "f2i"},
+       {(functionptr) asm_builtin_f2i,                    "f2i"},
        {(functionptr) builtin_f2l,                                "f2l"},
+       {(functionptr) asm_builtin_f2l,                    "f2l"},
        {(functionptr) builtin_f2d,                                "f2d"},
        {(functionptr) builtin_d2i,                                "d2i"},
+       {(functionptr) asm_builtin_d2i,                    "d2i"},
        {(functionptr) builtin_d2l,                                "d2l"},
+       {(functionptr) asm_builtin_d2l,                    "d2l"},
        {(functionptr) builtin_d2f,                                "d2f"},
        {(functionptr) NULL,                                       "unknown"}
        };

diff --git a/builtin.h b/builtin.h
index 94a9643a72445d2a9adb024d2a56e80d11b9d453..cfd81f69da791259641658de9b5a29a6d1ad6ca2 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -29,7 +29,7 @@ s4 builtin_isanysubclass (classinfo *sub, classinfo *super);
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class);
 s4 asm_builtin_checkcast(java_objectheader *obj, classinfo *class);
 s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *desc);
-#ifdef __I386__
+#if defined(__I386__)
 s4 asm_builtin_arrayinstanceof(java_objectheader *obj, classinfo *class);
 #endif
 s4 builtin_checkarraycast(java_objectheader *obj, constant_arraydescriptor *desc);
@@ -127,10 +127,18 @@ double   builtin_i2d (s4 i);
 s4       builtin_l2i (s8 l);
 float    builtin_l2f (s8 l);
 double   builtin_l2d (s8 l);
+
 s4       builtin_f2i (float a);
+s4       asm_builtin_f2i (float a);
 s8       builtin_f2l (float a);
+s8       asm_builtin_f2l (float a);
+
 double   builtin_f2d (float a);
+
 s4       builtin_d2i (double a);
+s4       asm_builtin_d2i (double a);
 s8       builtin_d2l (double a);
+s8       asm_builtin_d2l (double a);
+
 float    builtin_d2f (double a);
 

diff --git a/headers.c b/headers.c
index 0ecc53e5a305c9e313840a447e67f981421ce2a3..a56f63d246113e5ab5690849d6eb4861e2edcfda 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -15,7 +15,7 @@
        Changes: Mark Probst         EMAIL: cacao@complang.tuwien.ac.at
                 Philipp Tomsich     EMAIL: cacao@complang.tuwien.ac.at
 
-       Last Change: $Id: headers.c 491 2003-10-20 17:56:03Z twisti $
+       Last Change: $Id: headers.c 542 2003-10-30 20:58:18Z twisti $
 
 *******************************************************************************/
 
@@ -56,6 +56,10 @@ s4 asm_builtin_irem (s4 a, s4 b) {return 0;}
 s8 asm_builtin_ldiv (s8 a, s8 b) {return 0;}
 s8 asm_builtin_lrem (s8 a, s8 b) {return 0;}
 
+s4 asm_builtin_f2i (float a) { return 0; }
+s8 asm_builtin_f2l (float a) { return 0; }
+s4 asm_builtin_d2i (double a) { return 0; }
+s8 asm_builtin_d2l (double a) { return 0; }
 
 void asm_builtin_monitorenter (java_objectheader *o) {}
 void asm_builtin_monitorexit (java_objectheader *o) {}

diff --git a/src/cacaoh/headers.c b/src/cacaoh/headers.c
index 0ecc53e5a305c9e313840a447e67f981421ce2a3..a56f63d246113e5ab5690849d6eb4861e2edcfda 100644 (file)
--- a/src/cacaoh/headers.c
+++ b/src/cacaoh/headers.c
@@ -15,7 +15,7 @@
        Changes: Mark Probst         EMAIL: cacao@complang.tuwien.ac.at
                 Philipp Tomsich     EMAIL: cacao@complang.tuwien.ac.at
 
-       Last Change: $Id: headers.c 491 2003-10-20 17:56:03Z twisti $
+       Last Change: $Id: headers.c 542 2003-10-30 20:58:18Z twisti $
 
 *******************************************************************************/
 
@@ -56,6 +56,10 @@ s4 asm_builtin_irem (s4 a, s4 b) {return 0;}
 s8 asm_builtin_ldiv (s8 a, s8 b) {return 0;}
 s8 asm_builtin_lrem (s8 a, s8 b) {return 0;}
 
+s4 asm_builtin_f2i (float a) { return 0; }
+s8 asm_builtin_f2l (float a) { return 0; }
+s4 asm_builtin_d2i (double a) { return 0; }
+s8 asm_builtin_d2l (double a) { return 0; }
 
 void asm_builtin_monitorenter (java_objectheader *o) {}
 void asm_builtin_monitorexit (java_objectheader *o) {}

diff --git a/src/vm/builtin.c b/src/vm/builtin.c
index 021e218ecbf0d4f3b70329bfcfb291f594e3dae9..2c4f6b8b7ffc506d491627192ba745b2cd9f96eb 100644 (file)
--- a/src/vm/builtin.c
+++ b/src/vm/builtin.c
@@ -111,10 +111,14 @@ builtin_descriptor builtin_desc[] = {
        {(functionptr) builtin_l2f,                                "l2f"},
        {(functionptr) builtin_l2d,                                "l2d"},
        {(functionptr) builtin_f2i,                                "f2i"},
+       {(functionptr) asm_builtin_f2i,                    "f2i"},
        {(functionptr) builtin_f2l,                                "f2l"},
+       {(functionptr) asm_builtin_f2l,                    "f2l"},
        {(functionptr) builtin_f2d,                                "f2d"},
        {(functionptr) builtin_d2i,                                "d2i"},
+       {(functionptr) asm_builtin_d2i,                    "d2i"},
        {(functionptr) builtin_d2l,                                "d2l"},
+       {(functionptr) asm_builtin_d2l,                    "d2l"},
        {(functionptr) builtin_d2f,                                "d2f"},
        {(functionptr) NULL,                                       "unknown"}
        };

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index 94a9643a72445d2a9adb024d2a56e80d11b9d453..cfd81f69da791259641658de9b5a29a6d1ad6ca2 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -29,7 +29,7 @@ s4 builtin_isanysubclass (classinfo *sub, classinfo *super);
 s4 builtin_checkcast(java_objectheader *obj, classinfo *class);
 s4 asm_builtin_checkcast(java_objectheader *obj, classinfo *class);
 s4 builtin_arrayinstanceof(java_objectheader *obj, constant_arraydescriptor *desc);
-#ifdef __I386__
+#if defined(__I386__)
 s4 asm_builtin_arrayinstanceof(java_objectheader *obj, classinfo *class);
 #endif
 s4 builtin_checkarraycast(java_objectheader *obj, constant_arraydescriptor *desc);
@@ -127,10 +127,18 @@ double   builtin_i2d (s4 i);
 s4       builtin_l2i (s8 l);
 float    builtin_l2f (s8 l);
 double   builtin_l2d (s8 l);
+
 s4       builtin_f2i (float a);
+s4       asm_builtin_f2i (float a);
 s8       builtin_f2l (float a);
+s8       asm_builtin_f2l (float a);
+
 double   builtin_f2d (float a);
+
 s4       builtin_d2i (double a);
+s4       asm_builtin_d2i (double a);
 s8       builtin_d2l (double a);
+s8       asm_builtin_d2l (double a);
+
 float    builtin_d2f (double a);