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 Apr 14 20:38:11 CEST 2007
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/07/04 14:20:38

Modified: jop/java/target/src/common/com/jopdesign/sys JVM.java
JVMHelp.java
Log:
Hardware implementation of iaload and iastore


Revision Changes Path
1.22 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.21&r2=1.22

(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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- JVM.java 19 Jan 2007 17:51:23 -0000 1.21
+++ JVM.java 14 Apr 2007 18:38:10 -0000 1.22
@@ -171,7 +171,7 @@

if (b==0) {
// division by zero exception
- Native.wrMem(0x02, Const.IO_EXCPT);
+ Native.wrMem(Const.EXC_DIVZ, Const.IO_EXCPT);
return 0;
}
boolean neg = false;
@@ -262,7 +262,7 @@

if (b==0) {
// division by zero exception
- Native.wrMem(0x02, Const.IO_EXCPT);
+ Native.wrMem(Const.EXC_DIVZ, Const.IO_EXCPT);
return 0;
}
boolean neg = false;



1.17 jop/java/target/src/common/com/jopdesign/sys/JVMHelp.java

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

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

Index: JVMHelp.java
===================================================================
RCS file: /cvsroot/martin/jop/java/target/src/common/com/jopdesign/sys/JVMHelp.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- JVMHelp.java 30 Oct 2006 00:45:15 -0000 1.16
+++ JVMHelp.java 14 Apr 2007 18:38:10 -0000 1.17
@@ -77,9 +77,13 @@
int i;
i = Native.rdMem(Const.IO_EXCPT);
JVMHelp.wr("\nException: ");
- if (i==1) {
+ if (i==Const.EXC_SPOV) {
JVMHelp.wr("Stack overflow\n");
- } else if (i==2) {
+ } else if (i==Const.EXC_NP) {
+ JVMHelp.wr("Null pointer exception\n");
+ } else if (i==Const.EXC_AB) {
+ JVMHelp.wr("Array out of bounds exception\n");
+ } else if (i==Const.EXC_DIVZ) {
JVMHelp.wr("ArithmeticException\n");
}

@@ -90,12 +94,11 @@
wr("pc=");
wrSmall(pc);
i = Native.rdIntMem(sp); // mp
-wrSmall(i);
-wr(' ');
+ wr("mp=");
+ wrSmall(i);
int start = Native.rdMem(i)>>>10; // address of method
-wrSmall(start);
-wr(' ');
-wrByte(pc);
+ wr("start=");
+ wrSmall(start);

trace();

@@ -171,10 +174,12 @@
fp = vp+args+loc; // new fp can be calc. with vp and count of local vars
}
wr('\n');
+/*
for (fp=128; fp<=sp; ++fp) {
wrSmall(Native.rdIntMem(fp));
}
wr('\n');
+*/
/*
for (fp=10530; fp<=10700; ++fp) { wrSmall(Native.rdMem(fp));