Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20151007' into staging

[qemu.git] / target-arm / internals.h

diff --git a/target-arm/internals.h b/target-arm/internals.h
index 2cc301762caf2c742557862f256ffe197592a8e6..36a56aadb0b5222a97a1417bf465d3aaef09ae5f 100644 (file)
--- a/target-arm/internals.h
+++ b/target-arm/internals.h
@@ -36,6 +36,7 @@ static inline bool excp_is_internal(int excp)
         || excp == EXCP_HALTED
         || excp == EXCP_EXCEPTION_EXIT
         || excp == EXCP_KERNEL_TRAP
         || excp == EXCP_HALTED
         || excp == EXCP_EXCEPTION_EXIT
         || excp == EXCP_KERNEL_TRAP

+        || excp == EXCP_SEMIHOST

         || excp == EXCP_STREX;
 }
 
         || excp == EXCP_STREX;
 }
 


@@ -58,6 +59,7 @@ static const char * const excnames[] = {
     [EXCP_SMC] = "Secure Monitor Call",
     [EXCP_VIRQ] = "Virtual IRQ",
     [EXCP_VFIQ] = "Virtual FIQ",
     [EXCP_SMC] = "Secure Monitor Call",
     [EXCP_VIRQ] = "Virtual IRQ",
     [EXCP_VFIQ] = "Virtual FIQ",

+    [EXCP_SEMIHOST] = "Semihosting call",

 };
 
 static inline void arm_log_exception(int idx)
 };
 
 static inline void arm_log_exception(int idx)


@@ -347,6 +349,12 @@ static inline uint32_t syn_breakpoint(int same_el)
         | ARM_EL_IL | 0x22;
 }
 
         | ARM_EL_IL | 0x22;
 }
 

+static inline uint32_t syn_wfx(int cv, int cond, int ti)
+{
+    return (EC_WFX_TRAP << ARM_EL_EC_SHIFT) |
+           (cv << 24) | (cond << 20) | ti;
+}
+

 /* Update a QEMU watchpoint based on the information the guest has set in the
  * DBGWCR<n>_EL1 and DBGWVR<n>_EL1 registers.
  */
 /* Update a QEMU watchpoint based on the information the guest has set in the
  * DBGWCR<n>_EL1 and DBGWVR<n>_EL1 registers.
  */


@@ -381,4 +389,8 @@ bool arm_is_psci_call(ARMCPU *cpu, int excp_type);
 void arm_handle_psci_call(ARMCPU *cpu);
 #endif
 
 void arm_handle_psci_call(ARMCPU *cpu);
 #endif
 

+/* Do a page table walk and add page to TLB if possible */
+bool arm_tlb_fill(CPUState *cpu, vaddr address, int rw, int mmu_idx,
+                  uint32_t *fsr);
+

 #endif
 #endif