Fix elf loader range checking
[qemu] / target-cris / op_helper.c
index a681f84..edfaf41 100644 (file)
  *
  * 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 <assert.h>
 #include "exec.h"
 #include "mmu.h"
 #include "helper.h"
+#include "host-utils.h"
 
+//#define CRIS_OP_HELPER_DEBUG
+
+
+#ifdef CRIS_OP_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)
 
@@ -58,8 +67,8 @@ void tlb_fill (target_ulong addr, int is_write, int mmu_idx, void *retaddr)
     saved_env = env;
     env = cpu_single_env;
 
-    D(fprintf(logfile, "%s pc=%x tpc=%x ra=%x\n", __func__, 
-            env->pc, env->debug1, retaddr));
+    D_LOG("%s pc=%x tpc=%x ra=%x\n", __func__, 
+            env->pc, env->debug1, retaddr);
     ret = cpu_cris_handle_mmu_fault(env, addr, is_write, mmu_idx, 1);
     if (unlikely(ret)) {
         if (retaddr) {
@@ -107,7 +116,7 @@ void helper_spc_write(uint32_t new_spc)
 
 void helper_dump(uint32_t a0, uint32_t a1, uint32_t a2)
 {
-       (fprintf(logfile, "%s: a0=%x a1=%x\n", __func__, a0, a1)); 
+       qemu_log("%s: a0=%x a1=%x\n", __func__, a0, a1);
 }
 
 /* Used by the tlb decoder.  */
@@ -154,9 +163,8 @@ void helper_movl_sreg_reg (uint32_t sreg, uint32_t reg)
                        env->tlbsets[srs - 1][set][idx].lo = lo;
                        env->tlbsets[srs - 1][set][idx].hi = hi;
 
-                       D(fprintf(logfile, 
-                                 "tlb flush vaddr=%x v=%d pc=%x\n", 
-                                 vaddr, tlb_v, env->pc));
+                       D_LOG("tlb flush vaddr=%x v=%d pc=%x\n", 
+                                 vaddr, tlb_v, env->pc);
                        tlb_flush_page(env, vaddr);
                }
        }
@@ -212,10 +220,10 @@ void helper_rfe(void)
 {
        int rflag = env->pregs[PR_CCS] & R_FLAG;
 
-       D(fprintf(logfile, "rfe: erp=%x pid=%x ccs=%x btarget=%x\n", 
+       D_LOG("rfe: erp=%x pid=%x ccs=%x btarget=%x\n", 
                 env->pregs[PR_ERP], env->pregs[PR_PID],
                 env->pregs[PR_CCS],
-                env->btarget));
+                env->btarget);
 
        cris_ccs_rshift(env);
 
@@ -228,10 +236,10 @@ void helper_rfn(void)
 {
        int rflag = env->pregs[PR_CCS] & R_FLAG;
 
-       D(fprintf(logfile, "rfn: erp=%x pid=%x ccs=%x btarget=%x\n", 
+       D_LOG("rfn: erp=%x pid=%x ccs=%x btarget=%x\n", 
                 env->pregs[PR_ERP], env->pregs[PR_PID],
                 env->pregs[PR_CCS],
-                env->btarget));
+                env->btarget);
 
        cris_ccs_rshift(env);
 
@@ -243,46 +251,64 @@ void helper_rfn(void)
     env->pregs[PR_CCS] |= M_FLAG;
 }
 
-void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,
-                          int is_asi, int size)
+uint32_t helper_lz(uint32_t t0)
 {
-       D(printf("%s addr=%x w=%d ex=%d asi=%d, size=%d\n",
-               __func__, addr, is_write, is_exec, is_asi, size));
+       return clz32(t0);
 }
 
-static void evaluate_flags_writeback(uint32_t flags)
+uint32_t helper_btst(uint32_t t0, uint32_t t1, uint32_t ccs)
 {
-       int x;
+       /* FIXME: clean this up.  */
+
+       /* des ref:
+          The N flag is set according to the selected bit in the dest reg.
+          The Z flag is set if the selected bit and all bits to the right are
+          zero.
+          The X flag is cleared.
+          Other flags are left untouched.
+          The destination reg is not affected.*/
+       unsigned int fz, sbit, bset, mask, masked_t0;
+
+       sbit = t1 & 31;
+       bset = !!(t0 & (1 << sbit));
+       mask = sbit == 31 ? -1 : (1 << (sbit + 1)) - 1;
+       masked_t0 = t0 & mask;
+       fz = !(masked_t0 | bset);
+
+       /* Clear the X, N and Z flags.  */
+       ccs = ccs & ~(X_FLAG | N_FLAG | Z_FLAG);
+       /* Set the N and Z flags accordingly.  */
+       ccs |= (bset << 3) | (fz << 2);
+       return ccs;
+}
+
+static inline uint32_t evaluate_flags_writeback(uint32_t flags, uint32_t ccs)
+{
+       unsigned int x, z, mask;
 
        /* Extended arithmetics, leave the z flag alone.  */
        x = env->cc_x;
-       if ((x || env->cc_op == CC_OP_ADDC)
-           && flags & Z_FLAG)
-               env->cc_mask &= ~Z_FLAG;
+       mask = env->cc_mask | X_FLAG;
+        if (x) {
+               z = flags & Z_FLAG;
+               mask = mask & ~z;
+       }
+       flags &= mask;
 
        /* all insn clear the x-flag except setf or clrf.  */
-       env->pregs[PR_CCS] &= ~(env->cc_mask | X_FLAG);
-       flags &= env->cc_mask;
-       env->pregs[PR_CCS] |= flags;
+       ccs &= ~mask;
+       ccs |= flags;
+       return ccs;
 }
 
-void helper_evaluate_flags_muls(void)
+uint32_t helper_evaluate_flags_muls(uint32_t ccs, uint32_t res, uint32_t mof)
 {
-       uint32_t src;
-       uint32_t dst;
-       uint32_t res;
        uint32_t flags = 0;
        int64_t tmp;
-       int32_t mof;
        int dneg;
 
-       src = env->cc_src;
-       dst = env->cc_dest;
-       res = env->cc_result;
-
        dneg = ((int32_t)res) < 0;
 
-       mof = env->pregs[PR_MOF];
        tmp = mof;
        tmp <<= 32;
        tmp |= res;
@@ -293,23 +319,14 @@ void helper_evaluate_flags_muls(void)
        if ((dneg && mof != -1)
            || (!dneg && mof != 0))
                flags |= V_FLAG;
-       evaluate_flags_writeback(flags);
+       return evaluate_flags_writeback(flags, ccs);
 }
 
-void  helper_evaluate_flags_mulu(void)
+uint32_t helper_evaluate_flags_mulu(uint32_t ccs, uint32_t res, uint32_t mof)
 {
-       uint32_t src;
-       uint32_t dst;
-       uint32_t res;
        uint32_t flags = 0;
        uint64_t tmp;
-       uint32_t mof;
 
-       src = env->cc_src;
-       dst = env->cc_dest;
-       res = env->cc_result;
-
-       mof = env->pregs[PR_MOF];
        tmp = mof;
        tmp <<= 32;
        tmp |= res;
@@ -320,147 +337,125 @@ void  helper_evaluate_flags_mulu(void)
        if (mof)
                flags |= V_FLAG;
 
-       evaluate_flags_writeback(flags);
+       return evaluate_flags_writeback(flags, ccs);
 }
 
-void  helper_evaluate_flags_mcp(void)
+uint32_t helper_evaluate_flags_mcp(uint32_t ccs,
+                                  uint32_t src, uint32_t dst, uint32_t res)
 {
-       uint32_t src;
-       uint32_t dst;
-       uint32_t res;
        uint32_t flags = 0;
 
-       src = env->cc_src;
-       dst = env->cc_dest;
-       res = env->cc_result;
+       src = src & 0x80000000;
+       dst = dst & 0x80000000;
 
        if ((res & 0x80000000L) != 0L)
        {
                flags |= N_FLAG;
-               if (((src & 0x80000000L) == 0L)
-                   && ((dst & 0x80000000L) == 0L))
-               {
+               if (!src && !dst)
                        flags |= V_FLAG;
-               }
-               else if (((src & 0x80000000L) != 0L) &&
-                        ((dst & 0x80000000L) != 0L))
-               {
+               else if (src & dst)
                        flags |= R_FLAG;
-               }
        }
        else
        {
                if (res == 0L)
                        flags |= Z_FLAG;
-               if (((src & 0x80000000L) != 0L)
-                   && ((dst & 0x80000000L) != 0L))
+               if (src & dst) 
                        flags |= V_FLAG;
-               if ((dst & 0x80000000L) != 0L
-                   || (src & 0x80000000L) != 0L)
+               if (dst | src) 
                        flags |= R_FLAG;
        }
 
-       evaluate_flags_writeback(flags);
+       return evaluate_flags_writeback(flags, ccs);
 }
 
-void  helper_evaluate_flags_alu_4(void)
+uint32_t helper_evaluate_flags_alu_4(uint32_t ccs,
+                                    uint32_t src, uint32_t dst, uint32_t res)
 {
-       uint32_t src;
-       uint32_t dst;
-       uint32_t res;
        uint32_t flags = 0;
 
-       src = env->cc_src;
-       dst = env->cc_dest;
+       src = src & 0x80000000;
+       dst = dst & 0x80000000;
 
-       /* Reconstruct the result.  */
-       switch (env->cc_op)
+       if ((res & 0x80000000L) != 0L)
        {
-               case CC_OP_SUB:
-                       res = dst - src;
-                       break;
-               case CC_OP_ADD:
-                       res = dst + src;
-                       break;
-               default:
-                       res = env->cc_result;
-                       break;
+               flags |= N_FLAG;
+               if (!src && !dst)
+                       flags |= V_FLAG;
+               else if (src & dst)
+                       flags |= C_FLAG;
+       }
+       else
+       {
+               if (res == 0L)
+                       flags |= Z_FLAG;
+               if (src & dst) 
+                       flags |= V_FLAG;
+               if (dst | src) 
+                       flags |= C_FLAG;
        }
 
-       if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP)
-               src = ~src;
+       return evaluate_flags_writeback(flags, ccs);
+}
+
+uint32_t helper_evaluate_flags_sub_4(uint32_t ccs,
+                                    uint32_t src, uint32_t dst, uint32_t res)
+{
+       uint32_t flags = 0;
+
+       src = (~src) & 0x80000000;
+       dst = dst & 0x80000000;
 
        if ((res & 0x80000000L) != 0L)
        {
                flags |= N_FLAG;
-               if (((src & 0x80000000L) == 0L)
-                   && ((dst & 0x80000000L) == 0L))
-               {
+               if (!src && !dst)
                        flags |= V_FLAG;
-               }
-               else if (((src & 0x80000000L) != 0L) &&
-                        ((dst & 0x80000000L) != 0L))
-               {
+               else if (src & dst)
                        flags |= C_FLAG;
-               }
        }
        else
        {
                if (res == 0L)
                        flags |= Z_FLAG;
-               if (((src & 0x80000000L) != 0L)
-                   && ((dst & 0x80000000L) != 0L))
+               if (src & dst) 
                        flags |= V_FLAG;
-               if ((dst & 0x80000000L) != 0L
-                   || (src & 0x80000000L) != 0L)
+               if (dst | src) 
                        flags |= C_FLAG;
        }
 
-       if (env->cc_op == CC_OP_SUB
-           || env->cc_op == CC_OP_CMP) {
-               flags ^= C_FLAG;
-       }
-       evaluate_flags_writeback(flags);
+       flags ^= C_FLAG;
+       return evaluate_flags_writeback(flags, ccs);
 }
 
-void  helper_evaluate_flags_move_4 (void)
+uint32_t helper_evaluate_flags_move_4(uint32_t ccs, uint32_t res)
 {
-       uint32_t res;
        uint32_t flags = 0;
 
-       res = env->cc_result;
-
        if ((int32_t)res < 0)
                flags |= N_FLAG;
        else if (res == 0L)
                flags |= Z_FLAG;
 
-       evaluate_flags_writeback(flags);
+       return evaluate_flags_writeback(flags, ccs);
 }
-void  helper_evaluate_flags_move_2 (void)
+uint32_t helper_evaluate_flags_move_2(uint32_t ccs, uint32_t res)
 {
-       uint32_t src;
        uint32_t flags = 0;
-       uint16_t res;
-
-       src = env->cc_src;
-       res = env->cc_result;
 
        if ((int16_t)res < 0L)
                flags |= N_FLAG;
        else if (res == 0)
                flags |= Z_FLAG;
 
-       evaluate_flags_writeback(flags);
+       return evaluate_flags_writeback(flags, ccs);
 }
 
 /* TODO: This is expensive. We could split things up and only evaluate part of
    CCR on a need to know basis. For now, we simply re-evaluate everything.  */
-void helper_evaluate_flags (void)
+void  helper_evaluate_flags(void)
 {
-       uint32_t src;
-       uint32_t dst;
-       uint32_t res;
+       uint32_t src, dst, res;
        uint32_t flags = 0;
 
        src = env->cc_src;
@@ -571,11 +566,10 @@ void helper_evaluate_flags (void)
                        break;
        }
 
-       if (env->cc_op == CC_OP_SUB
-           || env->cc_op == CC_OP_CMP) {
+       if (env->cc_op == CC_OP_SUB || env->cc_op == CC_OP_CMP)
                flags ^= C_FLAG;
-       }
-       evaluate_flags_writeback(flags);
+
+       env->pregs[PR_CCS] = evaluate_flags_writeback(flags, env->pregs[PR_CCS]);
 }
 
 void helper_top_evaluate_flags(void)
@@ -583,13 +577,19 @@ void helper_top_evaluate_flags(void)
        switch (env->cc_op)
        {
                case CC_OP_MCP:
-                       helper_evaluate_flags_mcp();
+                       env->pregs[PR_CCS] = helper_evaluate_flags_mcp(
+                                       env->pregs[PR_CCS], env->cc_src,
+                                       env->cc_dest, env->cc_result);
                        break;
                case CC_OP_MULS:
-                       helper_evaluate_flags_muls();
+                       env->pregs[PR_CCS] = helper_evaluate_flags_muls(
+                                       env->pregs[PR_CCS], env->cc_result,
+                                       env->pregs[PR_MOF]);
                        break;
                case CC_OP_MULU:
-                       helper_evaluate_flags_mulu();
+                       env->pregs[PR_CCS] = helper_evaluate_flags_mulu(
+                                       env->pregs[PR_CCS], env->cc_result,
+                                       env->pregs[PR_MOF]);
                        break;
                case CC_OP_MOVE:
                case CC_OP_AND:
@@ -598,32 +598,53 @@ void helper_top_evaluate_flags(void)
                case CC_OP_ASR:
                case CC_OP_LSR:
                case CC_OP_LSL:
-                       switch (env->cc_size)
-                       {
-                               case 4:
-                                       helper_evaluate_flags_move_4();
-                                       break;
-                               case 2:
-                                       helper_evaluate_flags_move_2();
-                                       break;
-                               default:
-                                       helper_evaluate_flags();
-                                       break;
-                       }
-                       break;
+               switch (env->cc_size)
+               {
+                       case 4:
+                               env->pregs[PR_CCS] =
+                                       helper_evaluate_flags_move_4(
+                                                       env->pregs[PR_CCS],
+                                                       env->cc_result);
+                               break;
+                       case 2:
+                               env->pregs[PR_CCS] =
+                                       helper_evaluate_flags_move_2(
+                                                       env->pregs[PR_CCS],
+                                                       env->cc_result);
+                               break;
+                       default:
+                               helper_evaluate_flags();
+                               break;
+               }
+               break;
                case CC_OP_FLAGS:
                        /* live.  */
                        break;
+               case CC_OP_SUB:
+               case CC_OP_CMP:
+                       if (env->cc_size == 4)
+                               env->pregs[PR_CCS] =
+                                       helper_evaluate_flags_sub_4(
+                                               env->pregs[PR_CCS],
+                                               env->cc_src, env->cc_dest,
+                                               env->cc_result);
+                       else
+                               helper_evaluate_flags();
+                       break;
                default:
                {
                        switch (env->cc_size)
                        {
-                               case 4:
-                                       helper_evaluate_flags_alu_4();
-                                       break;
-                               default:
-                                       helper_evaluate_flags();
-                                       break;
+                       case 4:
+                               env->pregs[PR_CCS] =
+                                       helper_evaluate_flags_alu_4(
+                                               env->pregs[PR_CCS],
+                                               env->cc_src, env->cc_dest,
+                                               env->cc_result);
+                               break;
+                       default:
+                               helper_evaluate_flags();
+                               break;
                        }
                }
                break;