diff options
-rw-r--r-- | linux-user/main.c | 2 | ||||
-rw-r--r-- | sparc-dis.c | 2 | ||||
-rw-r--r-- | target-i386/helper.c | 14 | ||||
-rw-r--r-- | target-i386/translate.c | 2 | ||||
-rw-r--r-- | target-ppc/translate.c | 10 |
5 files changed, 15 insertions, 15 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index dc242f621c..259173bb83 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1633,7 +1633,7 @@ void cpu_loop (CPUState *env) call_pal(env, (trapnr >> 6) | 0x80); break; case EXCP_CALL_PALP ... (EXCP_CALL_PALE - 1): - fprintf(stderr, "Priviledged call to PALcode\n"); + fprintf(stderr, "Privileged call to PALcode\n"); exit(1); break; case EXCP_DEBUG: diff --git a/sparc-dis.c b/sparc-dis.c index 2be874ac94..f04f135df8 100644 --- a/sparc-dis.c +++ b/sparc-dis.c @@ -276,7 +276,7 @@ const struct sparc_opcode_arch sparc_opcode_archs[] = { { "v8", MASK_V6 | MASK_V7 | MASK_V8 }, { "sparclet", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLET }, { "sparclite", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLITE }, - /* ??? Don't some v8 priviledged insns conflict with v9? */ + /* ??? Don't some v8 privileged insns conflict with v9? */ { "v9", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 }, /* v9 with ultrasparc additions */ { "v9a", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 | MASK_V9A }, diff --git a/target-i386/helper.c b/target-i386/helper.c index 20c1f57620..ef4b77e88f 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -687,7 +687,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, if (!(e2 & DESC_P_MASK)) raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); if (!(e2 & DESC_C_MASK) && dpl < cpl) { - /* to inner priviledge */ + /* to inner privilege */ get_ss_esp_from_tss(&ss, &esp, dpl); if ((ss & 0xfffc) == 0) raise_exception_err(EXCP0A_TSS, ss & 0xfffc); @@ -708,7 +708,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, sp_mask = get_sp_mask(ss_e2); ssp = get_seg_base(ss_e1, ss_e2); } else if ((e2 & DESC_C_MASK) || dpl == cpl) { - /* to same priviledge */ + /* to same privilege */ if (env->eflags & VM_MASK) raise_exception_err(EXCP0D_GPF, selector & 0xfffc); new_stack = 0; @@ -901,7 +901,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, if (!(e2 & DESC_L_MASK) || (e2 & DESC_B_MASK)) raise_exception_err(EXCP0D_GPF, selector & 0xfffc); if ((!(e2 & DESC_C_MASK) && dpl < cpl) || ist != 0) { - /* to inner priviledge */ + /* to inner privilege */ if (ist != 0) esp = get_rsp_from_tss(ist + 3); else @@ -910,7 +910,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, ss = 0; new_stack = 1; } else if ((e2 & DESC_C_MASK) || dpl == cpl) { - /* to same priviledge */ + /* to same privilege */ if (env->eflags & VM_MASK) raise_exception_err(EXCP0D_GPF, selector & 0xfffc); new_stack = 0; @@ -2208,7 +2208,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); if (!(e2 & DESC_C_MASK) && dpl < cpl) { - /* to inner priviledge */ + /* to inner privilege */ get_ss_esp_from_tss(&ss, &sp, dpl); #ifdef DEBUG_PCALL if (loglevel & CPU_LOG_PCALL) @@ -2255,7 +2255,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) } new_stack = 1; } else { - /* to same priviledge */ + /* to same privilege */ sp = ESP; sp_mask = get_sp_mask(env->segs[R_SS].flags); ssp = env->segs[R_SS].base; @@ -2437,7 +2437,7 @@ static inline void helper_ret_protected(int shift, int is_iret, int addend) get_seg_limit(e1, e2), e2); } else { - /* return to different priviledge level */ + /* return to different privilege level */ #ifdef TARGET_X86_64 if (shift == 2) { POPQ(sp, new_esp); diff --git a/target-i386/translate.c b/target-i386/translate.c index 53ccc85990..e36e03d820 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -2245,7 +2245,7 @@ static void gen_exception(DisasContext *s, int trapno, target_ulong cur_eip) } /* an interrupt is different from an exception because of the - priviledge checks */ + privilege checks */ static void gen_interrupt(DisasContext *s, int intno, target_ulong cur_eip, target_ulong next_eip) { diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 2ea759ad96..e5064c0822 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -3026,10 +3026,10 @@ static inline void gen_op_mfspr (DisasContext *ctx) } else { /* Privilege exception */ if (loglevel != 0) { - fprintf(logfile, "Trying to read priviledged spr %d %03x\n", + fprintf(logfile, "Trying to read privileged spr %d %03x\n", sprn, sprn); } - printf("Trying to read priviledged spr %d %03x\n", sprn, sprn); + printf("Trying to read privileged spr %d %03x\n", sprn, sprn); RET_PRIVREG(ctx); } } else { @@ -3132,10 +3132,10 @@ GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000001, PPC_MISC) } else { /* Privilege exception */ if (loglevel != 0) { - fprintf(logfile, "Trying to write priviledged spr %d %03x\n", + fprintf(logfile, "Trying to write privileged spr %d %03x\n", sprn, sprn); } - printf("Trying to write priviledged spr %d %03x\n", sprn, sprn); + printf("Trying to write privileged spr %d %03x\n", sprn, sprn); RET_PRIVREG(ctx); } } else { @@ -4019,7 +4019,7 @@ GEN_HANDLER(clf, 0x1F, 0x16, 0x03, 0x03E00000, PPC_POWER) /* cli */ GEN_HANDLER(cli, 0x1F, 0x16, 0x0F, 0x03E00000, PPC_POWER) { - /* Cache line invalidate: priviledged and treated as no-op */ + /* Cache line invalidate: privileged and treated as no-op */ #if defined(CONFIG_USER_ONLY) RET_PRIVOPC(ctx); #else |