aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/twl92230.c1
-rw-r--r--target-arm/helper.c6
-rw-r--r--target-arm/translate.c4
3 files changed, 5 insertions, 6 deletions
diff --git a/hw/twl92230.c b/hw/twl92230.c
index a9f4faf056..8d0ce5da6c 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -62,7 +62,6 @@ struct menelaus_s {
int sec_offset;
int alm_sec;
int next_comp;
- struct tm *(*gettime)(const time_t *timep, struct tm *result);
} rtc;
qemu_irq handler[3];
qemu_irq *in;
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 30700e242f..5d70ef193b 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -737,7 +737,7 @@ void do_interrupt(CPUARMState *env)
new_mode = ARM_CPU_MODE_SVC;
addr = 0x08;
mask = CPSR_I;
- /* The PC already points to the next instructon. */
+ /* The PC already points to the next instruction. */
offset = 0;
break;
case EXCP_BKPT:
@@ -870,7 +870,7 @@ static int get_phys_addr_v5(CPUState *env, uint32_t address, int access_type,
type = (desc & 3);
domain = (env->cp15.c3 >> ((desc >> 4) & 0x1e)) & 3;
if (type == 0) {
- /* Secton translation fault. */
+ /* Section translation fault. */
code = 5;
goto do_fault;
}
@@ -961,7 +961,7 @@ static int get_phys_addr_v6(CPUState *env, uint32_t address, int access_type,
desc = ldl_phys(table);
type = (desc & 3);
if (type == 0) {
- /* Secton translation fault. */
+ /* Section translation fault. */
code = 5;
domain = 0;
goto do_fault;
diff --git a/target-arm/translate.c b/target-arm/translate.c
index e849b7fc3f..59158b3c7c 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2877,7 +2877,7 @@ static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn)
tmp = load_cpu_field(vfp.xregs[rn]);
break;
case ARM_VFP_FPSCR:
- if (rd == 15) {
+ if (rd == 15) {
tmp = load_cpu_field(vfp.xregs[ARM_VFP_FPSCR]);
tcg_gen_andi_i32(tmp, tmp, 0xf0000000);
} else {
@@ -6887,7 +6887,7 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)
if (!(arm_feature(env, ARM_FEATURE_THUMB2)
|| arm_feature (env, ARM_FEATURE_M))) {
- /* Thumb-1 cores may need to tread bl and blx as a pair of
+ /* Thumb-1 cores may need to treat bl and blx as a pair of
16-bit instructions to get correct prefetch abort behavior. */
insn = insn_hw1;
if ((insn & (1 << 12)) == 0) {