[Qemu-devel] [5448] CRIS: Partial EXS reg support and fixes for SPC.

[Qemu-devel] [5448] CRIS: Partial EXS reg support and fixes for SPC.

[Edgar E. Iglesias]

Revision: 5448
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5448
Author:   edgar_igl
Date:     2008-10-08 14:22:17 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
CRIS: Partial EXS reg support and fixes for SPC.

* Add partial support for the EXS (exception status) register.
* Update SPC after each singlestep exception.
* Remove special treatment of break 8.

Modified Paths:
--------------
    trunk/target-cris/helper.c
    trunk/target-cris/translate.c

Modified: trunk/target-cris/helper.c
===================================================================
--- trunk/target-cris/helper.c	2008-10-08 08:28:16 UTC (rev 5447)
+++ trunk/target-cris/helper.c	2008-10-08 14:22:17 UTC (rev 5448)
@@ -143,6 +143,9 @@
 			break;
 	}
 
+	/* Fill in the IDX field.  */
+	env->pregs[PR_EXS] = (ex_vec & 0xff) << 8;
+
 	if (env->dslot) {
 		D(fprintf(logfile, "excp isr=%x PC=%x ds=%d SP=%x"
 			  " ERP=%x pid=%x ccs=%x cc=%d %x\n",

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c	2008-10-08 08:28:16 UTC (rev 5447)
+++ trunk/target-cris/translate.c	2008-10-08 14:22:17 UTC (rev 5448)
@@ -196,10 +196,6 @@
 		tcg_gen_mov_tl(tn, tcg_const_tl(0));
 	else if (r == PR_VR)
 		tcg_gen_mov_tl(tn, tcg_const_tl(32));
-	else if (r == PR_EXS) {
-		printf("read from EXS!\n");
-		tcg_gen_mov_tl(tn, cpu_PR[r]);
-	}
 	else if (r == PR_EDA) {
 		printf("read from EDA!\n");
 		tcg_gen_mov_tl(tn, cpu_PR[r]);
@@ -2811,12 +2807,7 @@
 			DIS(fprintf(logfile, "break %d\n", dc->op1));
 			cris_evaluate_flags (dc);
 			/* break.  */
-			if (dc->op1 == 8) {
-				/* TODO: Find out whats special with brk8.  */
-				tcg_gen_movi_tl(env_pc, dc->pc);
-			}
-			else
-				tcg_gen_movi_tl(env_pc, dc->pc + 2);
+			tcg_gen_movi_tl(env_pc, dc->pc + 2);
 
 			/* Breaks start at 16 in the exception vector.  */
 			t_gen_mov_env_TN(trap_vector, 
@@ -3005,6 +2996,7 @@
 		cris_evaluate_flags (dc);
 		t_gen_mov_env_TN(trap_vector, tcg_const_tl(3));
 		tcg_gen_movi_tl(env_pc, dc->pc + insn_len);
+		tcg_gen_movi_tl(cpu_PR[PR_SPC], dc->pc + insn_len);
 		t_gen_raise_exception(EXCP_BREAK);
 		gen_set_label(l1);
 	}