projects
/
nestedvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clarify licensing
[nestedvm.git]
/
src
/
org
/
ibex
/
nestedvm
/
JavaSourceCompiler.java
diff --git
a/src/org/ibex/nestedvm/JavaSourceCompiler.java
b/src/org/ibex/nestedvm/JavaSourceCompiler.java
index
64a7d4d
..
d231f94
100644
(file)
--- a/
src/org/ibex/nestedvm/JavaSourceCompiler.java
+++ b/
src/org/ibex/nestedvm/JavaSourceCompiler.java
@@
-1,5
+1,5
@@
// Copyright 2000-2005 the Contributors, as shown in the revision logs.
// Copyright 2000-2005 the Contributors, as shown in the revision logs.
-// Licensed under the Apache Public Source License 2.0 ("the License").
+// Licensed under the Apache License 2.0 ("the License").
// You may not use this file except in compliance with the License.
package org.ibex.nestedvm;
// You may not use this file except in compliance with the License.
package org.ibex.nestedvm;
@@
-290,7
+290,7
@@
public class JavaSourceCompiler extends Compiler {
insn = nextInsn;
nextInsn = (i == count-1) ? -1 : dis.readInt();
if(addr >= endOfMethod) { endMethod(); startMethod(addr); }
insn = nextInsn;
nextInsn = (i == count-1) ? -1 : dis.readInt();
if(addr >= endOfMethod) { endMethod(); startMethod(addr); }
- if(jumpableAddresses==null || addr == startOfMethod || jumpableAddresses.contains(new Integer(addr))) {
+ if(jumpableAddresses==null || addr == startOfMethod || jumpableAddresses.get(new Integer(addr)) != null) {
p("case " + toHex(addr) + ":");
unreachable = false;
} else if(unreachable) {
p("case " + toHex(addr) + ":");
unreachable = false;
} else if(unreachable) {
@@
-427,6
+427,7
@@
public class JavaSourceCompiler extends Compiler {
break;
case 13: // BREAK
p( "throw new ExecutionException(\"Break\");");
break;
case 13: // BREAK
p( "throw new ExecutionException(\"Break\");");
+ unreachable = true;
break;
case 16: // MFHI
p( "r"+rd+" = hi;");
break;
case 16: // MFHI
p( "r"+rd+" = hi;");