projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged revisions 7797-7917 via svnmerge from
[cacao.git]
/
src
/
vm
/
jit
/
s390
/
asmpart.S
diff --git
a/src/vm/jit/s390/asmpart.S
b/src/vm/jit/s390/asmpart.S
index 1cceb97d3d313dd1eaa5d6f94e848daa5668fbc8..d8a30e6fe3b9ee37e2b5ba27c351adc244d19f15 100644
(file)
--- a/
src/vm/jit/s390/asmpart.S
+++ b/
src/vm/jit/s390/asmpart.S
@@
-22,7
+22,7
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: asmpart.S 7
680 2007-04-10 05:02:20
Z pm $
+ $Id: asmpart.S 7
839 2007-04-29 22:46:56
Z pm $
*/
*/
@@
-37,10
+37,6
@@
#include "vm/jit/abi-asm.h"
#include "vm/jit/methodheader.h"
#include "vm/jit/abi-asm.h"
#include "vm/jit/methodheader.h"
-/* Copy a call to a PIC function from gcc -S
- * We setup a temporary literal pool pointer.
- */
-
.text
.text
@@
-181,7
+177,7
@@
L_register_copy:
ahi itmp2, -1 /* decrement arg count */
je L_register_copy_done /* no arguments left */
ahi itmp2, -1 /* decrement arg count */
je L_register_copy_done /* no arguments left */
- tm offvmargtype
(itmp1), 0x02
/* is this a float/double type? */
+ tm offvmargtype
+7(itmp1), 0x02
/* is this a float/double type? */
jne L_register_handle_float
L_register_handle_int:
jne L_register_handle_float
L_register_handle_int:
@@
-189,7
+185,7
@@
L_register_handle_int:
chi s2, INT_ARG_CNT /* are we out of integer arg registers ? */
je L_register_copy /* yes, next loop */
chi s2, INT_ARG_CNT /* are we out of integer arg registers ? */
je L_register_copy /* yes, next loop */
- tm offvmargtype(itmp1), 0x01 /* is this a 2 word type ? */
+ tm offvmargtype
+7
(itmp1), 0x01 /* is this a 2 word type ? */
jne L_register_handle_long
ahi s0, 1 /* increment integer arg counter */
jne L_register_handle_long
ahi s0, 1 /* increment integer arg counter */
@@
-222,13
+218,13
@@
L_register_handle_long_continue:
/* handle argument */
/* handle argument */
- chi s2, 1
- je L_handle_l0
chi s2, 2
chi s2, 2
- je L_handle_l
1
+ je L_handle_l
0
chi s2, 3
chi s2, 3
- je L_handle_l
2
+ je L_handle_l
1
chi s2, 4
chi s2, 4
+ je L_handle_l2
+ chi s2, 5
je L_handle_l3
L_register_handle_float:
je L_handle_l3
L_register_handle_float:
@@
-238,7
+234,7
@@
L_register_handle_float:
ahi s1, 1 /* increment float argument counter */
ahi s1, 1 /* increment float argument counter */
- tm offvmargtype
(itmp1), 0x01
/* is this a 2 word type ? */
+ tm offvmargtype
+7(itmp1), 0x01
/* is this a 2 word type ? */
jne L_register_handle_double
/* handle argument */
jne L_register_handle_double
/* handle argument */
@@
-297,7
+293,7
@@
L_stack_copy_loop:
ahi itmp2, -1 /* decrement argument counter */
je L_copy_done /* all arguments done */
ahi itmp2, -1 /* decrement argument counter */
je L_copy_done /* all arguments done */
- tm offvmargtype
(itmp1), 0x0
/* is this a float/double type? */
+ tm offvmargtype
+7(itmp1), 0x02
/* is this a float/double type? */
jne L_stack_handle_float
L_stack_handle_int:
jne L_stack_handle_float
L_stack_handle_int:
@@
-305,10
+301,10
@@
L_stack_handle_int:
ahi s0, -1 /* decrement number of integer arguments in regs */
jhe L_stack_copy_loop /* argument is in register */
ahi s0, -1 /* decrement number of integer arguments in regs */
jhe L_stack_copy_loop /* argument is in register */
- tm offvmargtype
(itmp1), 0x01
/* is this a 2 word type ? */
+ tm offvmargtype
+7(itmp1), 0x01
/* is this a 2 word type ? */
jne L_stack_handle_long
jne L_stack_handle_long
- mvc 0(4, s2), offvmargdata+4(itmp1)
/* copy integer value */
+ mvc 0(4, s2), offvmargdata+4(itmp1)/* copy integer value */
ahi s2, 4
j L_stack_copy_loop
ahi s2, 4
j L_stack_copy_loop
@@
-323,7
+319,7
@@
L_stack_handle_float:
ahi s1, -1 /* decrement number of float arguments in regs */
jhe L_stack_copy_loop /* argument is in register */
ahi s1, -1 /* decrement number of float arguments in regs */
jhe L_stack_copy_loop /* argument is in register */
- tm offvmargtype
(itmp1), 0x01
/* is this a 2 word type ? */
+ tm offvmargtype
+7(itmp1), 0x01
/* is this a 2 word type ? */
jne L_stack_handle_double
mvc 0(4, s2), offvmargdata(itmp1) /* copy float value */
jne L_stack_handle_double
mvc 0(4, s2), offvmargdata(itmp1) /* copy float value */