Author: neale
Date: 2006-06-09 15:53:21 -0400 (Fri, 09 Jun 2006)
New Revision: 61603
Modified:
trunk/mono/mono/io-layer/ChangeLog
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini-s390.c
trunk/mono/mono/mini/mini-s390.h
Log:
* mono/mini/mini-s390.c: Correct ATOMIC operations (incorrect register for CS
instruction).
* mono/mini/mini-s390.h: Simplify MCONTEXT_GET_BP.
* mono/io-layer/ChangeLog: Move comment from mono/mini
* mono/mini/ChangeLog: Correct comments
Modified: trunk/mono/mono/io-layer/ChangeLog
===================================================================
--- trunk/mono/mono/io-layer/ChangeLog 2006-06-09 19:08:15 UTC (rev 61602)
+++ trunk/mono/mono/io-layer/ChangeLog 2006-06-09 19:53:21 UTC (rev 61603)
@@ -1,3 +1,8 @@
+2006-06-09 Neale Ferguson <[EMAIL PROTECTED]>
+
+ * atomic.h: Fix atomic operations for s390x (not really broken
+ but changed to use full 64-bit opcodes).
+
2006-05-24 Dick Porter <[EMAIL PROTECTED]>
* processes.c (process_set_current): Don't take an extra reference
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2006-06-09 19:08:15 UTC (rev 61602)
+++ trunk/mono/mono/mini/ChangeLog 2006-06-09 19:53:21 UTC (rev 61603)
@@ -1,12 +1,10 @@
2006-06-09 Neale Ferguson <[EMAIL PROTECTED]>
* mini-exceptions.c (ves_icall_get_frame_info): Fix this function on
s390/s390x.
- * mono/io-layer/atomic.h: Fix atomic operations for s390x (not really
broken
- but changed to use full 64-bit opcodes).
- * mono/mini/mini-s390x.c: Correct ATOMIC operations (incorrect register
for CS
+ * mini-s390x.c, mini-s390.c: Correct ATOMIC operations (incorrect
register for CS
instruction).
- * mono/mini/mini-s390x.h: Simplify MCONTEXT_GET_BP.
- * mono/mini/cpu-s390x.md: Fix max. length values for a couple of
instructions.
+ * mini-s390x.h, mini-s390.h: Simplify MCONTEXT_GET_BP.
+ * cpu-s390x.md: Fix max. length values for a couple of instructions.
2006-06-09 Jonathan Chambers <[EMAIL PROTECTED]>
Modified: trunk/mono/mono/mini/mini-s390.c
===================================================================
--- trunk/mono/mono/mini/mini-s390.c 2006-06-09 19:08:15 UTC (rev 61602)
+++ trunk/mono/mono/mini/mini-s390.c 2006-06-09 19:53:21 UTC (rev 61603)
@@ -3929,7 +3929,7 @@
s390_lr (code, s390_r1, ins->sreg2);
s390_l (code, s390_r0, 0, ins->inst_basereg,
ins->inst_offset);
s390_a (code, s390_r1, 0, ins->inst_basereg,
ins->inst_offset);
- s390_cs (code, s390_r0, s390_r0, ins->inst_basereg,
ins->inst_offset);
+ s390_cs (code, s390_r0, s390_r1, ins->inst_basereg,
ins->inst_offset);
s390_jnz (code, -7);
s390_lr (code, ins->dreg, s390_r1);
}
Modified: trunk/mono/mono/mini/mini-s390.h
===================================================================
--- trunk/mono/mono/mini/mini-s390.h 2006-06-09 19:08:15 UTC (rev 61602)
+++ trunk/mono/mono/mini/mini-s390.h 2006-06-09 19:53:21 UTC (rev 61603)
@@ -254,7 +254,7 @@
#define MONO_INIT_CONTEXT_FROM_FUNC(ctx,func) do { \
MonoS390StackFrame *sframe; \
- __asm__ volatile("l %0,0(15)" : "=r" (sframe)); \
+ __asm__ volatile("lr %0,15" : "=r" (sframe)); \
MONO_CONTEXT_SET_BP ((ctx), sframe->prev); \
sframe = (MonoS390StackFrame*)sframe->prev; \
MONO_CONTEXT_SET_IP ((ctx), sframe->return_address); \
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
