Merge commit 'juri/juha-devel'
[qemu] / target-cris / helper.c
index 7482e08..ae2f8dd 100644 (file)
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
  */
 
 #include <stdio.h>
 #include "exec-all.h"
 #include "host-utils.h"
 
+
+//#define CRIS_HELPER_DEBUG
+
+
+#ifdef CRIS_HELPER_DEBUG
+#define D(x) x
+#define D_LOG(...) qemu_log(__VA__ARGS__)
+#else
+#define D(x)
+#define D_LOG(...) do { } while (0)
+#endif
+
 #if defined(CONFIG_USER_ONLY)
 
 void do_interrupt (CPUState *env)
@@ -40,9 +52,8 @@ int cpu_cris_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
                              int mmu_idx, int is_softmmu)
 {
        env->exception_index = 0xaa;
-       env->debug1 = address;
+       env->pregs[PR_EDA] = address;
        cpu_dump_state(env, stderr, fprintf, 0);
-       env->pregs[PR_ERP] = env->pc;
        return 1;
 }
 
@@ -53,106 +64,128 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
 
 #else /* !CONFIG_USER_ONLY */
 
+
+static void cris_shift_ccs(CPUState *env)
+{
+       uint32_t ccs;
+       /* Apply the ccs shift.  */
+       ccs = env->pregs[PR_CCS];
+       ccs = ((ccs & 0xc0000000) | ((ccs << 12) >> 2)) & ~0x3ff;
+       env->pregs[PR_CCS] = ccs;
+}
+
 int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
                                int mmu_idx, int is_softmmu)
 {
        struct cris_mmu_result_t res;
        int prot, miss;
+       int r = -1;
        target_ulong phy;
 
+       D(printf ("%s addr=%x pc=%x rw=%x\n", __func__, address, env->pc, rw));
        address &= TARGET_PAGE_MASK;
-       prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
        miss = cris_mmu_translate(&res, env, address, rw, mmu_idx);
        if (miss)
        {
-               /* handle the miss.  */
-               phy = 0;
-               env->exception_index = EXCP_MMU_MISS;
+               if (env->exception_index == EXCP_BUSFAULT)
+                       cpu_abort(env, 
+                                 "CRIS: Illegal recursive bus fault."
+                                 "addr=%x rw=%d\n",
+                                 address, rw);
+
+               env->exception_index = EXCP_BUSFAULT;
+               env->fault_vector = res.bf_vec;
+               r = 1;
        }
        else
        {
-               phy = res.phy;
+               /*
+                * Mask off the cache selection bit. The ETRAX busses do not
+                * see the top bit.
+                */
+               phy = res.phy & ~0x80000000;
+               prot = res.prot;
+               r = tlb_set_page(env, address, phy, prot, mmu_idx, is_softmmu);
        }
-       return tlb_set_page(env, address, phy, prot, mmu_idx, is_softmmu);
-}
-
-
-static void cris_shift_ccs(CPUState *env)
-{
-       uint32_t ccs;
-       /* Apply the ccs shift.  */
-       ccs = env->pregs[PR_CCS];
-       ccs = (ccs & 0xc0000000) | ((ccs << 12) >> 2);
-       env->pregs[PR_CCS] = ccs;
+       if (r > 0)
+               D_LOG("%s returns %d irqreq=%x addr=%x"
+                         " phy=%x ismmu=%d vec=%x pc=%x\n", 
+                         __func__, r, env->interrupt_request, 
+                         address, res.phy, is_softmmu, res.bf_vec, env->pc);
+       return r;
 }
 
 void do_interrupt(CPUState *env)
 {
-       uint32_t ebp, isr;
-       int irqnum;
-
-       fflush(NULL);
+       int ex_vec = -1;
 
-#if 0
-       printf ("exception index=%d interrupt_req=%d\n",
-               env->exception_index,
-               env->interrupt_request);
-#endif
+       D_LOG( "exception index=%d interrupt_req=%d\n",
+                  env->exception_index,
+                  env->interrupt_request);
 
        switch (env->exception_index)
        {
                case EXCP_BREAK:
-                       irqnum = env->trapnr;
-                       ebp = env->pregs[PR_EBP];
-                       isr = ldl_code(ebp + irqnum * 4);
-                       env->pregs[PR_ERP] = env->pc + 2;
-                       env->pc = isr;
-
-                       cris_shift_ccs(env);
+                       /* These exceptions are genereated by the core itself.
+                          ERP should point to the insn following the brk.  */
+                       ex_vec = env->trap_vector;
+                       env->pregs[PR_ERP] = env->pc;
+                       break;
 
+               case EXCP_NMI:
+                       /* NMI is hardwired to vector zero.  */
+                       ex_vec = 0;
+                       env->pregs[PR_CCS] &= ~M_FLAG;
+                       env->pregs[PR_NRP] = env->pc;
                        break;
-               case EXCP_MMU_MISS:
-                       irqnum = 4;
-                       ebp = env->pregs[PR_EBP];
-                       isr = ldl_code(ebp + irqnum * 4);
+
+               case EXCP_BUSFAULT:
+                       ex_vec = env->fault_vector;
                        env->pregs[PR_ERP] = env->pc;
-                       env->pc = isr;
-                       cris_shift_ccs(env);
                        break;
 
                default:
-               {
-                       /* Maybe the irq was acked by sw before we got a
-                          change to take it.  */
-                       if (env->interrupt_request & CPU_INTERRUPT_HARD) {
-                               if (!env->pending_interrupts)
-                                       return;
-                               if (!(env->pregs[PR_CCS] & I_FLAG)) {
-                                       return;
-                               }
-
-                               irqnum = 31 - clz32(env->pending_interrupts);
-                               irqnum += 0x30;
-                               ebp = env->pregs[PR_EBP];
-                               isr = ldl_code(ebp + irqnum * 4);
-                               env->pregs[PR_ERP] = env->pc;
-                               env->pc = isr;
-
-                               cris_shift_ccs(env);
-#if 0
-                               printf ("%s ebp=%x %x isr=%x %d"
-                                       " ir=%x pending=%x\n",
-                                       __func__,
-                                       ebp, ebp + irqnum * 4,
-                                       isr, env->exception_index,
-                                       env->interrupt_request,
-                                       env->pending_interrupts);
-#endif
-                       }
+                       /* The interrupt controller gives us the vector.  */
+                       ex_vec = env->interrupt_vector;
+                       /* Normal interrupts are taken between
+                          TB's.  env->pc is valid here.  */
+                       env->pregs[PR_ERP] = env->pc;
+                       break;
+       }
+
+       /* Fill in the IDX field.  */
+       env->pregs[PR_EXS] = (ex_vec & 0xff) << 8;
+
+       if (env->dslot) {
+               D_LOG("excp isr=%x PC=%x ds=%d SP=%x"
+                         " ERP=%x pid=%x ccs=%x cc=%d %x\n",
+                         ex_vec, env->pc, env->dslot,
+                         env->regs[R_SP],
+                         env->pregs[PR_ERP], env->pregs[PR_PID],
+                         env->pregs[PR_CCS],
+                         env->cc_op, env->cc_mask);
+               /* We loose the btarget, btaken state here so rexec the
+                  branch.  */
+               env->pregs[PR_ERP] -= env->dslot;
+               /* Exception starts with dslot cleared.  */
+               env->dslot = 0;
+       }
+       
+       env->pc = ldl_code(env->pregs[PR_EBP] + ex_vec * 4);
 
-               }
-               break;
+       if (env->pregs[PR_CCS] & U_FLAG) {
+               /* Swap stack pointers.  */
+               env->pregs[PR_USP] = env->regs[R_SP];
+               env->regs[R_SP] = env->ksp;
        }
+
+       /* Apply the CRIS CCS shift. Clears U if set.  */
+       cris_shift_ccs(env);
+       D_LOG("%s isr=%x vec=%x ccs=%x pid=%d erp=%x\n", 
+                  __func__, env->pc, ex_vec, 
+                  env->pregs[PR_CCS],
+                  env->pregs[PR_PID], 
+                  env->pregs[PR_ERP]);
 }
 
 target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
@@ -163,6 +196,7 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
        miss = cris_mmu_translate(&res, env, addr, 0, 0);
        if (!miss)
                phy = res.phy;
+       D(fprintf(stderr, "%s %x -> %x\n", __func__, addr, phy));
        return phy;
 }
 #endif