* m32r.c (do_lock,do_unlock): Delete.

	* cpu.[ch],decode.[ch],extract.c,model.c: Regenerate.
	* sem.c,sem-switch.c: Regenerate.
	* cpux.[ch],decodex.[ch],readx.c,semx.c: Regenerate.

1 files changed, 152 insertions, 143 deletions

diff --git a/sim/m32r/decode.h b/sim/m32r/decode.h
index 3511e31..5bc1508 100644
--- a/sim/m32r/decode.h
+++ b/sim/m32r/decode.h
@@ -27,259 +27,268 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #define EX(fn) XCONCAT3 (m32r,_ex_,fn)
 #define SEM(fn) XCONCAT3 (m32r,_sem_,fn)
-#define SEMC(fn) XCONCAT3 (m32r,_semc_,fn)
+#define SEMF(fn) XCONCAT3 (m32r,_semf_,fn)
 
 extern EXTRACT_FN EX (illegal);
 extern SEMANTIC_FN SEM (illegal);
-extern SEMANTIC_CACHE_FN SEMC (illegal);
-
+extern SEMANTIC_FN SEMF (illegal);
 extern EXTRACT_FN EX (fmt_0_add);
 extern EXTRACT_FN EX (fmt_1_add3);
 extern EXTRACT_FN EX (fmt_2_and3);
 extern EXTRACT_FN EX (fmt_3_or3);
 extern EXTRACT_FN EX (fmt_4_addi);
-extern EXTRACT_FN EX (fmt_5_addv3);
-extern EXTRACT_FN EX (fmt_6_addx);
-extern EXTRACT_FN EX (fmt_7_bc8);
-extern EXTRACT_FN EX (fmt_8_bc24);
-extern EXTRACT_FN EX (fmt_9_beq);
-extern EXTRACT_FN EX (fmt_10_beqz);
-extern EXTRACT_FN EX (fmt_11_bl8);
-extern EXTRACT_FN EX (fmt_12_bl24);
-extern EXTRACT_FN EX (fmt_13_bra8);
-extern EXTRACT_FN EX (fmt_14_bra24);
-extern EXTRACT_FN EX (fmt_15_cmp);
-extern EXTRACT_FN EX (fmt_16_cmpi);
-extern EXTRACT_FN EX (fmt_17_cmpui);
-extern EXTRACT_FN EX (fmt_18_div);
-extern EXTRACT_FN EX (fmt_19_jl);
-extern EXTRACT_FN EX (fmt_20_jmp);
-extern EXTRACT_FN EX (fmt_21_ld);
-extern EXTRACT_FN EX (fmt_22_ld_d);
-extern EXTRACT_FN EX (fmt_23_ldb);
-extern EXTRACT_FN EX (fmt_24_ldb_d);
-extern EXTRACT_FN EX (fmt_25_ldh);
-extern EXTRACT_FN EX (fmt_26_ldh_d);
-extern EXTRACT_FN EX (fmt_27_ld24);
-extern EXTRACT_FN EX (fmt_28_ldi8);
-extern EXTRACT_FN EX (fmt_29_ldi16);
-extern EXTRACT_FN EX (fmt_30_machi);
-extern EXTRACT_FN EX (fmt_31_mv);
-extern EXTRACT_FN EX (fmt_32_mvfachi);
-extern EXTRACT_FN EX (fmt_33_mvfc);
-extern EXTRACT_FN EX (fmt_34_mvtachi);
-extern EXTRACT_FN EX (fmt_35_mvtc);
-extern EXTRACT_FN EX (fmt_36_nop);
-extern EXTRACT_FN EX (fmt_37_rac);
-extern EXTRACT_FN EX (fmt_38_rte);
-extern EXTRACT_FN EX (fmt_39_seth);
-extern EXTRACT_FN EX (fmt_40_slli);
-extern EXTRACT_FN EX (fmt_41_st_d);
-extern EXTRACT_FN EX (fmt_42_trap);
+extern EXTRACT_FN EX (fmt_5_addv);
+extern EXTRACT_FN EX (fmt_6_addv3);
+extern EXTRACT_FN EX (fmt_7_addx);
+extern EXTRACT_FN EX (fmt_8_bc8);
+extern EXTRACT_FN EX (fmt_9_bc24);
+extern EXTRACT_FN EX (fmt_10_beq);
+extern EXTRACT_FN EX (fmt_11_beqz);
+extern EXTRACT_FN EX (fmt_12_bl8);
+extern EXTRACT_FN EX (fmt_13_bl24);
+extern EXTRACT_FN EX (fmt_14_bra8);
+extern EXTRACT_FN EX (fmt_15_bra24);
+extern EXTRACT_FN EX (fmt_16_cmp);
+extern EXTRACT_FN EX (fmt_17_cmpi);
+extern EXTRACT_FN EX (fmt_18_cmpui);
+extern EXTRACT_FN EX (fmt_19_div);
+extern EXTRACT_FN EX (fmt_20_jl);
+extern EXTRACT_FN EX (fmt_21_jmp);
+extern EXTRACT_FN EX (fmt_22_ld);
+extern EXTRACT_FN EX (fmt_23_ld_d);
+extern EXTRACT_FN EX (fmt_24_ldb);
+extern EXTRACT_FN EX (fmt_25_ldb_d);
+extern EXTRACT_FN EX (fmt_26_ldh);
+extern EXTRACT_FN EX (fmt_27_ldh_d);
+extern EXTRACT_FN EX (fmt_28_ld_plus);
+extern EXTRACT_FN EX (fmt_29_ld24);
+extern EXTRACT_FN EX (fmt_30_ldi8);
+extern EXTRACT_FN EX (fmt_31_ldi16);
+extern EXTRACT_FN EX (fmt_32_lock);
+extern EXTRACT_FN EX (fmt_33_machi);
+extern EXTRACT_FN EX (fmt_34_mulhi);
+extern EXTRACT_FN EX (fmt_35_mv);
+extern EXTRACT_FN EX (fmt_36_mvfachi);
+extern EXTRACT_FN EX (fmt_37_mvfc);
+extern EXTRACT_FN EX (fmt_38_mvtachi);
+extern EXTRACT_FN EX (fmt_39_mvtc);
+extern EXTRACT_FN EX (fmt_40_nop);
+extern EXTRACT_FN EX (fmt_41_rac);
+extern EXTRACT_FN EX (fmt_42_rte);
+extern EXTRACT_FN EX (fmt_43_seth);
+extern EXTRACT_FN EX (fmt_44_sll3);
+extern EXTRACT_FN EX (fmt_45_slli);
+extern EXTRACT_FN EX (fmt_46_st);
+extern EXTRACT_FN EX (fmt_47_st_d);
+extern EXTRACT_FN EX (fmt_48_stb);
+extern EXTRACT_FN EX (fmt_49_stb_d);
+extern EXTRACT_FN EX (fmt_50_sth);
+extern EXTRACT_FN EX (fmt_51_sth_d);
+extern EXTRACT_FN EX (fmt_52_st_plus);
+extern EXTRACT_FN EX (fmt_53_trap);
+extern EXTRACT_FN EX (fmt_54_unlock);
 
 extern SEMANTIC_FN SEM (add);
-extern SEMANTIC_CACHE_FN SEMC (add);
+extern SEMANTIC_FN SEMF (add);
 extern SEMANTIC_FN SEM (add3);
-extern SEMANTIC_CACHE_FN SEMC (add3);
+extern SEMANTIC_FN SEMF (add3);
 extern SEMANTIC_FN SEM (and);
-extern SEMANTIC_CACHE_FN SEMC (and);
+extern SEMANTIC_FN SEMF (and);
 extern SEMANTIC_FN SEM (and3);
-extern SEMANTIC_CACHE_FN SEMC (and3);
+extern SEMANTIC_FN SEMF (and3);
 extern SEMANTIC_FN SEM (or);
-extern SEMANTIC_CACHE_FN SEMC (or);
+extern SEMANTIC_FN SEMF (or);
 extern SEMANTIC_FN SEM (or3);
-extern SEMANTIC_CACHE_FN SEMC (or3);
+extern SEMANTIC_FN SEMF (or3);
 extern SEMANTIC_FN SEM (xor);
-extern SEMANTIC_CACHE_FN SEMC (xor);
+extern SEMANTIC_FN SEMF (xor);
 extern SEMANTIC_FN SEM (xor3);
-extern SEMANTIC_CACHE_FN SEMC (xor3);
+extern SEMANTIC_FN SEMF (xor3);
 extern SEMANTIC_FN SEM (addi);
-extern SEMANTIC_CACHE_FN SEMC (addi);
+extern SEMANTIC_FN SEMF (addi);
 extern SEMANTIC_FN SEM (addv);
-extern SEMANTIC_CACHE_FN SEMC (addv);
+extern SEMANTIC_FN SEMF (addv);
 extern SEMANTIC_FN SEM (addv3);
-extern SEMANTIC_CACHE_FN SEMC (addv3);
+extern SEMANTIC_FN SEMF (addv3);
 extern SEMANTIC_FN SEM (addx);
-extern SEMANTIC_CACHE_FN SEMC (addx);
+extern SEMANTIC_FN SEMF (addx);
 extern SEMANTIC_FN SEM (bc8);
-extern SEMANTIC_CACHE_FN SEMC (bc8);
+extern SEMANTIC_FN SEMF (bc8);
 extern SEMANTIC_FN SEM (bc24);
-extern SEMANTIC_CACHE_FN SEMC (bc24);
+extern SEMANTIC_FN SEMF (bc24);
 extern SEMANTIC_FN SEM (beq);
-extern SEMANTIC_CACHE_FN SEMC (beq);
+extern SEMANTIC_FN SEMF (beq);
 extern SEMANTIC_FN SEM (beqz);
-extern SEMANTIC_CACHE_FN SEMC (beqz);
+extern SEMANTIC_FN SEMF (beqz);
 extern SEMANTIC_FN SEM (bgez);
-extern SEMANTIC_CACHE_FN SEMC (bgez);
+extern SEMANTIC_FN SEMF (bgez);
 extern SEMANTIC_FN SEM (bgtz);
-extern SEMANTIC_CACHE_FN SEMC (bgtz);
+extern SEMANTIC_FN SEMF (bgtz);
 extern SEMANTIC_FN SEM (blez);
-extern SEMANTIC_CACHE_FN SEMC (blez);
+extern SEMANTIC_FN SEMF (blez);
 extern SEMANTIC_FN SEM (bltz);
-extern SEMANTIC_CACHE_FN SEMC (bltz);
+extern SEMANTIC_FN SEMF (bltz);
 extern SEMANTIC_FN SEM (bnez);
-extern SEMANTIC_CACHE_FN SEMC (bnez);
+extern SEMANTIC_FN SEMF (bnez);
 extern SEMANTIC_FN SEM (bl8);
-extern SEMANTIC_CACHE_FN SEMC (bl8);
+extern SEMANTIC_FN SEMF (bl8);
 extern SEMANTIC_FN SEM (bl24);
-extern SEMANTIC_CACHE_FN SEMC (bl24);
+extern SEMANTIC_FN SEMF (bl24);
 extern SEMANTIC_FN SEM (bnc8);
-extern SEMANTIC_CACHE_FN SEMC (bnc8);
+extern SEMANTIC_FN SEMF (bnc8);
 extern SEMANTIC_FN SEM (bnc24);
-extern SEMANTIC_CACHE_FN SEMC (bnc24);
+extern SEMANTIC_FN SEMF (bnc24);
 extern SEMANTIC_FN SEM (bne);
-extern SEMANTIC_CACHE_FN SEMC (bne);
+extern SEMANTIC_FN SEMF (bne);
 extern SEMANTIC_FN SEM (bra8);
-extern SEMANTIC_CACHE_FN SEMC (bra8);
+extern SEMANTIC_FN SEMF (bra8);
 extern SEMANTIC_FN SEM (bra24);
-extern SEMANTIC_CACHE_FN SEMC (bra24);
+extern SEMANTIC_FN SEMF (bra24);
 extern SEMANTIC_FN SEM (cmp);
-extern SEMANTIC_CACHE_FN SEMC (cmp);
+extern SEMANTIC_FN SEMF (cmp);
 extern SEMANTIC_FN SEM (cmpi);
-extern SEMANTIC_CACHE_FN SEMC (cmpi);
+extern SEMANTIC_FN SEMF (cmpi);
 extern SEMANTIC_FN SEM (cmpu);
-extern SEMANTIC_CACHE_FN SEMC (cmpu);
+extern SEMANTIC_FN SEMF (cmpu);
 extern SEMANTIC_FN SEM (cmpui);
-extern SEMANTIC_CACHE_FN SEMC (cmpui);
+extern SEMANTIC_FN SEMF (cmpui);
 extern SEMANTIC_FN SEM (div);
-extern SEMANTIC_CACHE_FN SEMC (div);
+extern SEMANTIC_FN SEMF (div);
 extern SEMANTIC_FN SEM (divu);
-extern SEMANTIC_CACHE_FN SEMC (divu);
+extern SEMANTIC_FN SEMF (divu);
 extern SEMANTIC_FN SEM (rem);
-extern SEMANTIC_CACHE_FN SEMC (rem);
+extern SEMANTIC_FN SEMF (rem);
 extern SEMANTIC_FN SEM (remu);
-extern SEMANTIC_CACHE_FN SEMC (remu);
-extern SEMANTIC_FN SEM (divh);
-extern SEMANTIC_CACHE_FN SEMC (divh);
+extern SEMANTIC_FN SEMF (remu);
 extern SEMANTIC_FN SEM (jl);
-extern SEMANTIC_CACHE_FN SEMC (jl);
+extern SEMANTIC_FN SEMF (jl);
 extern SEMANTIC_FN SEM (jmp);
-extern SEMANTIC_CACHE_FN SEMC (jmp);
+extern SEMANTIC_FN SEMF (jmp);
 extern SEMANTIC_FN SEM (ld);
-extern SEMANTIC_CACHE_FN SEMC (ld);
+extern SEMANTIC_FN SEMF (ld);
 extern SEMANTIC_FN SEM (ld_d);
-extern SEMANTIC_CACHE_FN SEMC (ld_d);
+extern SEMANTIC_FN SEMF (ld_d);
 extern SEMANTIC_FN SEM (ldb);
-extern SEMANTIC_CACHE_FN SEMC (ldb);
+extern SEMANTIC_FN SEMF (ldb);
 extern SEMANTIC_FN SEM (ldb_d);
-extern SEMANTIC_CACHE_FN SEMC (ldb_d);
+extern SEMANTIC_FN SEMF (ldb_d);
 extern SEMANTIC_FN SEM (ldh);
-extern SEMANTIC_CACHE_FN SEMC (ldh);
+extern SEMANTIC_FN SEMF (ldh);
 extern SEMANTIC_FN SEM (ldh_d);
-extern SEMANTIC_CACHE_FN SEMC (ldh_d);
+extern SEMANTIC_FN SEMF (ldh_d);
 extern SEMANTIC_FN SEM (ldub);
-extern SEMANTIC_CACHE_FN SEMC (ldub);
+extern SEMANTIC_FN SEMF (ldub);
 extern SEMANTIC_FN SEM (ldub_d);
-extern SEMANTIC_CACHE_FN SEMC (ldub_d);
+extern SEMANTIC_FN SEMF (ldub_d);
 extern SEMANTIC_FN SEM (lduh);
-extern SEMANTIC_CACHE_FN SEMC (lduh);
+extern SEMANTIC_FN SEMF (lduh);
 extern SEMANTIC_FN SEM (lduh_d);
-extern SEMANTIC_CACHE_FN SEMC (lduh_d);
+extern SEMANTIC_FN SEMF (lduh_d);
 extern SEMANTIC_FN SEM (ld_plus);
-extern SEMANTIC_CACHE_FN SEMC (ld_plus);
+extern SEMANTIC_FN SEMF (ld_plus);
 extern SEMANTIC_FN SEM (ld24);
-extern SEMANTIC_CACHE_FN SEMC (ld24);
+extern SEMANTIC_FN SEMF (ld24);
 extern SEMANTIC_FN SEM (ldi8);
-extern SEMANTIC_CACHE_FN SEMC (ldi8);
+extern SEMANTIC_FN SEMF (ldi8);
 extern SEMANTIC_FN SEM (ldi16);
-extern SEMANTIC_CACHE_FN SEMC (ldi16);
+extern SEMANTIC_FN SEMF (ldi16);
 extern SEMANTIC_FN SEM (lock);
-extern SEMANTIC_CACHE_FN SEMC (lock);
+extern SEMANTIC_FN SEMF (lock);
 extern SEMANTIC_FN SEM (machi);
-extern SEMANTIC_CACHE_FN SEMC (machi);
+extern SEMANTIC_FN SEMF (machi);
 extern SEMANTIC_FN SEM (maclo);
-extern SEMANTIC_CACHE_FN SEMC (maclo);
+extern SEMANTIC_FN SEMF (maclo);
 extern SEMANTIC_FN SEM (macwhi);
-extern SEMANTIC_CACHE_FN SEMC (macwhi);
+extern SEMANTIC_FN SEMF (macwhi);
 extern SEMANTIC_FN SEM (macwlo);
-extern SEMANTIC_CACHE_FN SEMC (macwlo);
+extern SEMANTIC_FN SEMF (macwlo);
 extern SEMANTIC_FN SEM (mul);
-extern SEMANTIC_CACHE_FN SEMC (mul);
+extern SEMANTIC_FN SEMF (mul);
 extern SEMANTIC_FN SEM (mulhi);
-extern SEMANTIC_CACHE_FN SEMC (mulhi);
+extern SEMANTIC_FN SEMF (mulhi);
 extern SEMANTIC_FN SEM (mullo);
-extern SEMANTIC_CACHE_FN SEMC (mullo);
+extern SEMANTIC_FN SEMF (mullo);
 extern SEMANTIC_FN SEM (mulwhi);
-extern SEMANTIC_CACHE_FN SEMC (mulwhi);
+extern SEMANTIC_FN SEMF (mulwhi);
 extern SEMANTIC_FN SEM (mulwlo);
-extern SEMANTIC_CACHE_FN SEMC (mulwlo);
+extern SEMANTIC_FN SEMF (mulwlo);
 extern SEMANTIC_FN SEM (mv);
-extern SEMANTIC_CACHE_FN SEMC (mv);
+extern SEMANTIC_FN SEMF (mv);
 extern SEMANTIC_FN SEM (mvfachi);
-extern SEMANTIC_CACHE_FN SEMC (mvfachi);
+extern SEMANTIC_FN SEMF (mvfachi);
 extern SEMANTIC_FN SEM (mvfaclo);
-extern SEMANTIC_CACHE_FN SEMC (mvfaclo);
+extern SEMANTIC_FN SEMF (mvfaclo);
 extern SEMANTIC_FN SEM (mvfacmi);
-extern SEMANTIC_CACHE_FN SEMC (mvfacmi);
+extern SEMANTIC_FN SEMF (mvfacmi);
 extern SEMANTIC_FN SEM (mvfc);
-extern SEMANTIC_CACHE_FN SEMC (mvfc);
+extern SEMANTIC_FN SEMF (mvfc);
 extern SEMANTIC_FN SEM (mvtachi);
-extern SEMANTIC_CACHE_FN SEMC (mvtachi);
+extern SEMANTIC_FN SEMF (mvtachi);
 extern SEMANTIC_FN SEM (mvtaclo);
-extern SEMANTIC_CACHE_FN SEMC (mvtaclo);
+extern SEMANTIC_FN SEMF (mvtaclo);
 extern SEMANTIC_FN SEM (mvtc);
-extern SEMANTIC_CACHE_FN SEMC (mvtc);
+extern SEMANTIC_FN SEMF (mvtc);
 extern SEMANTIC_FN SEM (neg);
-extern SEMANTIC_CACHE_FN SEMC (neg);
+extern SEMANTIC_FN SEMF (neg);
 extern SEMANTIC_FN SEM (nop);
-extern SEMANTIC_CACHE_FN SEMC (nop);
+extern SEMANTIC_FN SEMF (nop);
 extern SEMANTIC_FN SEM (not);
-extern SEMANTIC_CACHE_FN SEMC (not);
+extern SEMANTIC_FN SEMF (not);
 extern SEMANTIC_FN SEM (rac);
-extern SEMANTIC_CACHE_FN SEMC (rac);
+extern SEMANTIC_FN SEMF (rac);
 extern SEMANTIC_FN SEM (rach);
-extern SEMANTIC_CACHE_FN SEMC (rach);
+extern SEMANTIC_FN SEMF (rach);
 extern SEMANTIC_FN SEM (rte);
-extern SEMANTIC_CACHE_FN SEMC (rte);
+extern SEMANTIC_FN SEMF (rte);
 extern SEMANTIC_FN SEM (seth);
-extern SEMANTIC_CACHE_FN SEMC (seth);
+extern SEMANTIC_FN SEMF (seth);
 extern SEMANTIC_FN SEM (sll);
-extern SEMANTIC_CACHE_FN SEMC (sll);
+extern SEMANTIC_FN SEMF (sll);
 extern SEMANTIC_FN SEM (sll3);
-extern SEMANTIC_CACHE_FN SEMC (sll3);
+extern SEMANTIC_FN SEMF (sll3);
 extern SEMANTIC_FN SEM (slli);
-extern SEMANTIC_CACHE_FN SEMC (slli);
+extern SEMANTIC_FN SEMF (slli);
 extern SEMANTIC_FN SEM (sra);
-extern SEMANTIC_CACHE_FN SEMC (sra);
+extern SEMANTIC_FN SEMF (sra);
 extern SEMANTIC_FN SEM (sra3);
-extern SEMANTIC_CACHE_FN SEMC (sra3);
+extern SEMANTIC_FN SEMF (sra3);
 extern SEMANTIC_FN SEM (srai);
-extern SEMANTIC_CACHE_FN SEMC (srai);
+extern SEMANTIC_FN SEMF (srai);
 extern SEMANTIC_FN SEM (srl);
-extern SEMANTIC_CACHE_FN SEMC (srl);
+extern SEMANTIC_FN SEMF (srl);
 extern SEMANTIC_FN SEM (srl3);
-extern SEMANTIC_CACHE_FN SEMC (srl3);
+extern SEMANTIC_FN SEMF (srl3);
 extern SEMANTIC_FN SEM (srli);
-extern SEMANTIC_CACHE_FN SEMC (srli);
+extern SEMANTIC_FN SEMF (srli);
 extern SEMANTIC_FN SEM (st);
-extern SEMANTIC_CACHE_FN SEMC (st);
+extern SEMANTIC_FN SEMF (st);
 extern SEMANTIC_FN SEM (st_d);
-extern SEMANTIC_CACHE_FN SEMC (st_d);
+extern SEMANTIC_FN SEMF (st_d);
 extern SEMANTIC_FN SEM (stb);
-extern SEMANTIC_CACHE_FN SEMC (stb);
+extern SEMANTIC_FN SEMF (stb);
 extern SEMANTIC_FN SEM (stb_d);
-extern SEMANTIC_CACHE_FN SEMC (stb_d);
+extern SEMANTIC_FN SEMF (stb_d);
 extern SEMANTIC_FN SEM (sth);
-extern SEMANTIC_CACHE_FN SEMC (sth);
+extern SEMANTIC_FN SEMF (sth);
 extern SEMANTIC_FN SEM (sth_d);
-extern SEMANTIC_CACHE_FN SEMC (sth_d);
+extern SEMANTIC_FN SEMF (sth_d);
 extern SEMANTIC_FN SEM (st_plus);
-extern SEMANTIC_CACHE_FN SEMC (st_plus);
+extern SEMANTIC_FN SEMF (st_plus);
 extern SEMANTIC_FN SEM (st_minus);
-extern SEMANTIC_CACHE_FN SEMC (st_minus);
+extern SEMANTIC_FN SEMF (st_minus);
 extern SEMANTIC_FN SEM (sub);
-extern SEMANTIC_CACHE_FN SEMC (sub);
+extern SEMANTIC_FN SEMF (sub);
 extern SEMANTIC_FN SEM (subv);
-extern SEMANTIC_CACHE_FN SEMC (subv);
+extern SEMANTIC_FN SEMF (subv);
 extern SEMANTIC_FN SEM (subx);
-extern SEMANTIC_CACHE_FN SEMC (subx);
+extern SEMANTIC_FN SEMF (subx);
 extern SEMANTIC_FN SEM (trap);
-extern SEMANTIC_CACHE_FN SEMC (trap);
+extern SEMANTIC_FN SEMF (trap);
 extern SEMANTIC_FN SEM (unlock);
-extern SEMANTIC_CACHE_FN SEMC (unlock);
+extern SEMANTIC_FN SEMF (unlock);
 
 #undef EX
 #undef SEM
-#undef SEMC
+#undef SEMF
 
 #endif /* M32R_DECODE_H */