Message

Reply | Reply all

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

From: cvs at opencores.org<cvs@o...>
Date: Sat Sep 16 14:39:35 CEST 2006
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/06/09 16:14:39

Modified: jop/java/target/src/common/com/jopdesign/sys Startup.java
Log:
detect memory size enabled again


Revision Changes Path
1.16 jop/java/target/src/common/com/jopdesign/sys/Startup.java

http://www.opencores.org/cvsweb.shtml/jop/java/target/src/common/com/jopdesign/sys/Startup.java.diff?r1=1.15&r2=1.16

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

Index: Startup.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/common/com/jopdesign/sys/Startup.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Startup.java 19 Aug 2006 13:00:51 -0000 1.15
+++ Startup.java 16 Sep 2006 12:39:34 -0000 1.16
@@ -58,7 +58,6 @@
static void msg() {

JVMHelp.wr("JOP start");
- JVMHelp.wr("TODO: JopSim ram size");

}

@@ -67,27 +66,25 @@
*/
static int getRamSize() {

-// int size = 0;
-// int firstWord = Native.rd(0);
-// int val;
-// boolean search = true;
-//
-// // increment in 1024 Bytes
-// for (size=256; search; size+=256) {
-// val = Native.rd(size);
-// Native.wr(0xaaaa5555, size);
-// if (Native.rd(size)!=0xaaaa5555) search = false;
-// Native.wr(0x12345678, size);
-// if (Native.rd(size)!=0x12345678) search = false;
-// if (Native.rd(0)!=firstWord) search = false;
-// // restore current word
-// Native.wr(val, size);
-// }
-// // restore the first word
-// Native.wr(firstWord, 0);
-// return size;
-
- return 1024*1024/4;
+ int size = 0;
+ int firstWord = Native.rd(0);
+ int val;
+ boolean search = true;
+
+ // increment in 1024 Bytes
+ for (size=256; search; size+=256) {
+ val = Native.rd(size);
+ Native.wr(0xaaaa5555, size);
+ if (Native.rd(size)!=0xaaaa5555) search = false;
+ Native.wr(0x12345678, size);
+ if (Native.rd(size)!=0x12345678) search = false;
+ if (Native.rd(0)!=firstWord) search = false;
+ // restore current word
+ Native.wr(val, size);
+ }
+ // restore the first word
+ Native.wr(firstWord, 0);
+ return size;
}

/**