Message

Reply | Reply all

Date Prev | Date Next | Thread Prev | Thread Next Date Index | Thread Index

From: cvs at opencores.org<cvs@o...>
Date: Thu May 31 01:05:59 CEST 2007
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/07/05 31:01:05

Modified: jop/java/target/src/common/com/jopdesign/sys JVM.java
Log:



Revision Changes Path
1.27 jop/java/target/src/common/com/jopdesign/sys/JVM.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/com/jopdesign/sys/JVM.java.diff?r1=1.26&r2=1.27

(In the diff below, changes in quantity of whitespace are not shown.)

Index: JVM.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/common/com/jopdesign/sys/JVM.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- JVM.java 30 May 2007 20:03:37 -0000 1.26
+++ JVM.java 30 May 2007 23:05:59 -0000 1.27
@@ -789,9 +789,9 @@

synchronized (GC.mutex) {
// snapshot-at-beginning barrier
- int oldRef = Native.rdMem(addr);
- if (oldRef!=0 && Native.rdMem(oldRef+GC.OFF_SPACE)!=GC.toSpace) {
- GC.push(oldRef);
+ int oldVal = Native.rdMem(addr);
+ if (oldVal!=0 && Native.rdMem(oldVal+GC.OFF_SPACE)!=GC.toSpace) {
+ GC.push(oldVal);
}
Native.wrMem(val, addr);
}
@@ -807,17 +807,17 @@
// push the object on mark stack if not
// black - that's the what kind of
// write barrier?
- int space = Native.rdMem(ref+GC.OFF_SPACE);
- if (space!=GC.toSpace) {
+ if (ref!=0 && Native.rdMem(ref+GC.OFF_SPACE)!=GC.toSpace) {
GC.push(ref);
}
*/

+ // handle indirection
ref = Native.rdMem(ref);
// snapshot-at-beginning barrier
- int oldRef = Native.rdMem(ref+index);
- if (oldRef!=0 && Native.rdMem(oldRef+GC.OFF_SPACE)!=GC.toSpace) {
- GC.push(oldRef);
+ int oldVal = Native.rdMem(ref+index);
+ if (oldVal!=0 && Native.rdMem(oldVal+GC.OFF_SPACE)!=GC.toSpace) {
+ GC.push(oldVal);
}

Native.wrMem(val, ref+index);