--- a/src/HOL/MicroJava/JVM/JVMDefensive.thy Mon Mar 01 12:30:55 2010 +0100
+++ b/src/HOL/MicroJava/JVM/JVMDefensive.thy Mon Mar 01 13:42:31 2010 +0100
@@ -4,7 +4,9 @@
header {* \isaheader{A Defensive JVM} *}
-theory JVMDefensive imports JVMExec begin
+theory JVMDefensive
+imports JVMExec
+begin
text {*
Extend the state space by one element indicating a type error (or
@@ -16,39 +18,32 @@
fifth :: "'a \<times> 'b \<times> 'c \<times> 'd \<times> 'e \<times> 'f \<Rightarrow> 'e"
where "fifth x == fst(snd(snd(snd(snd x))))"
-
-consts isAddr :: "val \<Rightarrow> bool"
-recdef isAddr "{}"
+fun isAddr :: "val \<Rightarrow> bool" where
"isAddr (Addr loc) = True"
- "isAddr v = False"
+| "isAddr v = False"
-consts isIntg :: "val \<Rightarrow> bool"
-recdef isIntg "{}"
+fun isIntg :: "val \<Rightarrow> bool" where
"isIntg (Intg i) = True"
- "isIntg v = False"
+| "isIntg v = False"
-constdefs
- isRef :: "val \<Rightarrow> bool"
+definition isRef :: "val \<Rightarrow> bool" where
"isRef v \<equiv> v = Null \<or> isAddr v"
-
-consts
- check_instr :: "[instr, jvm_prog, aheap, opstack, locvars,
- cname, sig, p_count, nat, frame list] \<Rightarrow> bool"
-primrec
+primrec check_instr :: "[instr, jvm_prog, aheap, opstack, locvars,
+ cname, sig, p_count, nat, frame list] \<Rightarrow> bool" where
"check_instr (Load idx) G hp stk vars C sig pc mxs frs =
(idx < length vars \<and> size stk < mxs)"
- "check_instr (Store idx) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Store idx) G hp stk vars Cl sig pc mxs frs =
(0 < length stk \<and> idx < length vars)"
- "check_instr (LitPush v) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (LitPush v) G hp stk vars Cl sig pc mxs frs =
(\<not>isAddr v \<and> size stk < mxs)"
- "check_instr (New C) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (New C) G hp stk vars Cl sig pc mxs frs =
(is_class G C \<and> size stk < mxs)"
- "check_instr (Getfield F C) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Getfield F C) G hp stk vars Cl sig pc mxs frs =
(0 < length stk \<and> is_class G C \<and> field (G,C) F \<noteq> None \<and>
(let (C', T) = the (field (G,C) F); ref = hd stk in
C' = C \<and> isRef ref \<and> (ref \<noteq> Null \<longrightarrow>
@@ -56,7 +51,7 @@
(let (D,vs) = the (hp (the_Addr ref)) in
G \<turnstile> D \<preceq>C C \<and> vs (F,C) \<noteq> None \<and> G,hp \<turnstile> the (vs (F,C)) ::\<preceq> T))))"
- "check_instr (Putfield F C) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Putfield F C) G hp stk vars Cl sig pc mxs frs =
(1 < length stk \<and> is_class G C \<and> field (G,C) F \<noteq> None \<and>
(let (C', T) = the (field (G,C) F); v = hd stk; ref = hd (tl stk) in
C' = C \<and> isRef ref \<and> (ref \<noteq> Null \<longrightarrow>
@@ -64,10 +59,10 @@
(let (D,vs) = the (hp (the_Addr ref)) in
G \<turnstile> D \<preceq>C C \<and> G,hp \<turnstile> v ::\<preceq> T))))"
- "check_instr (Checkcast C) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Checkcast C) G hp stk vars Cl sig pc mxs frs =
(0 < length stk \<and> is_class G C \<and> isRef (hd stk))"
- "check_instr (Invoke C mn ps) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Invoke C mn ps) G hp stk vars Cl sig pc mxs frs =
(length ps < length stk \<and>
(let n = length ps; v = stk!n in
isRef v \<and> (v \<noteq> Null \<longrightarrow>
@@ -75,41 +70,40 @@
method (G,cname_of hp v) (mn,ps) \<noteq> None \<and>
list_all2 (\<lambda>v T. G,hp \<turnstile> v ::\<preceq> T) (rev (take n stk)) ps)))"
- "check_instr Return G hp stk0 vars Cl sig0 pc mxs frs =
+| "check_instr Return G hp stk0 vars Cl sig0 pc mxs frs =
(0 < length stk0 \<and> (0 < length frs \<longrightarrow>
method (G,Cl) sig0 \<noteq> None \<and>
(let v = hd stk0; (C, rT, body) = the (method (G,Cl) sig0) in
Cl = C \<and> G,hp \<turnstile> v ::\<preceq> rT)))"
- "check_instr Pop G hp stk vars Cl sig pc mxs frs =
+| "check_instr Pop G hp stk vars Cl sig pc mxs frs =
(0 < length stk)"
- "check_instr Dup G hp stk vars Cl sig pc mxs frs =
+| "check_instr Dup G hp stk vars Cl sig pc mxs frs =
(0 < length stk \<and> size stk < mxs)"
- "check_instr Dup_x1 G hp stk vars Cl sig pc mxs frs =
+| "check_instr Dup_x1 G hp stk vars Cl sig pc mxs frs =
(1 < length stk \<and> size stk < mxs)"
- "check_instr Dup_x2 G hp stk vars Cl sig pc mxs frs =
+| "check_instr Dup_x2 G hp stk vars Cl sig pc mxs frs =
(2 < length stk \<and> size stk < mxs)"
- "check_instr Swap G hp stk vars Cl sig pc mxs frs =
+| "check_instr Swap G hp stk vars Cl sig pc mxs frs =
(1 < length stk)"
- "check_instr IAdd G hp stk vars Cl sig pc mxs frs =
+| "check_instr IAdd G hp stk vars Cl sig pc mxs frs =
(1 < length stk \<and> isIntg (hd stk) \<and> isIntg (hd (tl stk)))"
- "check_instr (Ifcmpeq b) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Ifcmpeq b) G hp stk vars Cl sig pc mxs frs =
(1 < length stk \<and> 0 \<le> int pc+b)"
- "check_instr (Goto b) G hp stk vars Cl sig pc mxs frs =
+| "check_instr (Goto b) G hp stk vars Cl sig pc mxs frs =
(0 \<le> int pc+b)"
- "check_instr Throw G hp stk vars Cl sig pc mxs frs =
+| "check_instr Throw G hp stk vars Cl sig pc mxs frs =
(0 < length stk \<and> isRef (hd stk))"
-constdefs
- check :: "jvm_prog \<Rightarrow> jvm_state \<Rightarrow> bool"
+definition check :: "jvm_prog \<Rightarrow> jvm_state \<Rightarrow> bool" where
"check G s \<equiv> let (xcpt, hp, frs) = s in
(case frs of [] \<Rightarrow> True | (stk,loc,C,sig,pc)#frs' \<Rightarrow>
(let (C',rt,mxs,mxl,ins,et) = the (method (G,C) sig); i = ins!pc in
@@ -117,7 +111,7 @@
check_instr i G hp stk loc C sig pc mxs frs'))"
- exec_d :: "jvm_prog \<Rightarrow> jvm_state type_error \<Rightarrow> jvm_state option type_error"
+definition exec_d :: "jvm_prog \<Rightarrow> jvm_state type_error \<Rightarrow> jvm_state option type_error" where
"exec_d G s \<equiv> case s of
TypeError \<Rightarrow> TypeError
| Normal s' \<Rightarrow> if check G s' then Normal (exec (G, s')) else TypeError"