--- a/src/HOL/MicroJava/JVM/JVMExec.thy Sun Dec 16 00:18:44 2001 +0100
+++ b/src/HOL/MicroJava/JVM/JVMExec.thy Sun Dec 16 00:19:08 2001 +0100
@@ -1,39 +1,39 @@
(* Title: HOL/MicroJava/JVM/JVMExec.thy
ID: $Id$
- Author: Cornelia Pusch
+ Author: Cornelia Pusch, Gerwin Klein
Copyright 1999 Technische Universitaet Muenchen
*)
header {* Program Execution in the JVM *}
-theory JVMExec = JVMExecInstr :
+theory JVMExec = JVMExecInstr + JVMExceptions:
consts
exec :: "jvm_prog \<times> jvm_state => jvm_state option"
-(** exec is not recursive. recdef is just used for pattern matching **)
+-- "exec is not recursive. recdef is just used for pattern matching"
recdef exec "{}"
"exec (G, xp, hp, []) = None"
"exec (G, None, hp, (stk,loc,C,sig,pc)#frs) =
(let
- i = snd(snd(snd(snd(the(method (G,C) sig))))) ! pc
- in
- Some (exec_instr i G hp stk loc C sig pc frs))"
+ i = fst(snd(snd(snd(snd(the(method (G,C) sig)))))) ! pc;
+ (xcpt', hp', frs') = exec_instr i G hp stk loc C sig pc frs
+ in Some (find_handler G xcpt' hp' frs'))"
"exec (G, Some xp, hp, frs) = None"
constdefs
- exec_all :: "[jvm_prog,jvm_state,jvm_state] => bool"
+ exec_all :: "[jvm_prog,jvm_state,jvm_state] => bool"
("_ |- _ -jvm-> _" [61,61,61]60)
"G |- s -jvm-> t == (s,t) \<in> {(s,t). exec(G,s) = Some t}^*"
syntax (xsymbols)
- exec_all :: "[jvm_prog,jvm_state,jvm_state] => bool"
+ exec_all :: "[jvm_prog,jvm_state,jvm_state] => bool"
("_ \<turnstile> _ -jvm-> _" [61,61,61]60)
end