Commit 7f75ffd39e4857dbeea32594e7523bf311aecf87
1 parent
dbe06e18
Spelling fix (Mark Glines)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2879 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
5 changed files
with
15 additions
and
15 deletions
linux-user/main.c
@@ -1633,7 +1633,7 @@ void cpu_loop (CPUState *env) | @@ -1633,7 +1633,7 @@ void cpu_loop (CPUState *env) | ||
1633 | call_pal(env, (trapnr >> 6) | 0x80); | 1633 | call_pal(env, (trapnr >> 6) | 0x80); |
1634 | break; | 1634 | break; |
1635 | case EXCP_CALL_PALP ... (EXCP_CALL_PALE - 1): | 1635 | case EXCP_CALL_PALP ... (EXCP_CALL_PALE - 1): |
1636 | - fprintf(stderr, "Priviledged call to PALcode\n"); | 1636 | + fprintf(stderr, "Privileged call to PALcode\n"); |
1637 | exit(1); | 1637 | exit(1); |
1638 | break; | 1638 | break; |
1639 | case EXCP_DEBUG: | 1639 | case EXCP_DEBUG: |
sparc-dis.c
@@ -276,7 +276,7 @@ const struct sparc_opcode_arch sparc_opcode_archs[] = { | @@ -276,7 +276,7 @@ const struct sparc_opcode_arch sparc_opcode_archs[] = { | ||
276 | { "v8", MASK_V6 | MASK_V7 | MASK_V8 }, | 276 | { "v8", MASK_V6 | MASK_V7 | MASK_V8 }, |
277 | { "sparclet", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLET }, | 277 | { "sparclet", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLET }, |
278 | { "sparclite", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLITE }, | 278 | { "sparclite", MASK_V6 | MASK_V7 | MASK_V8 | MASK_SPARCLITE }, |
279 | - /* ??? Don't some v8 priviledged insns conflict with v9? */ | 279 | + /* ??? Don't some v8 privileged insns conflict with v9? */ |
280 | { "v9", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 }, | 280 | { "v9", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 }, |
281 | /* v9 with ultrasparc additions */ | 281 | /* v9 with ultrasparc additions */ |
282 | { "v9a", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 | MASK_V9A }, | 282 | { "v9a", MASK_V6 | MASK_V7 | MASK_V8 | MASK_V9 | MASK_V9A }, |
target-i386/helper.c
@@ -687,7 +687,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, | @@ -687,7 +687,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, | ||
687 | if (!(e2 & DESC_P_MASK)) | 687 | if (!(e2 & DESC_P_MASK)) |
688 | raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); | 688 | raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); |
689 | if (!(e2 & DESC_C_MASK) && dpl < cpl) { | 689 | if (!(e2 & DESC_C_MASK) && dpl < cpl) { |
690 | - /* to inner priviledge */ | 690 | + /* to inner privilege */ |
691 | get_ss_esp_from_tss(&ss, &esp, dpl); | 691 | get_ss_esp_from_tss(&ss, &esp, dpl); |
692 | if ((ss & 0xfffc) == 0) | 692 | if ((ss & 0xfffc) == 0) |
693 | raise_exception_err(EXCP0A_TSS, ss & 0xfffc); | 693 | raise_exception_err(EXCP0A_TSS, ss & 0xfffc); |
@@ -708,7 +708,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, | @@ -708,7 +708,7 @@ static void do_interrupt_protected(int intno, int is_int, int error_code, | ||
708 | sp_mask = get_sp_mask(ss_e2); | 708 | sp_mask = get_sp_mask(ss_e2); |
709 | ssp = get_seg_base(ss_e1, ss_e2); | 709 | ssp = get_seg_base(ss_e1, ss_e2); |
710 | } else if ((e2 & DESC_C_MASK) || dpl == cpl) { | 710 | } else if ((e2 & DESC_C_MASK) || dpl == cpl) { |
711 | - /* to same priviledge */ | 711 | + /* to same privilege */ |
712 | if (env->eflags & VM_MASK) | 712 | if (env->eflags & VM_MASK) |
713 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); | 713 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); |
714 | new_stack = 0; | 714 | new_stack = 0; |
@@ -901,7 +901,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, | @@ -901,7 +901,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, | ||
901 | if (!(e2 & DESC_L_MASK) || (e2 & DESC_B_MASK)) | 901 | if (!(e2 & DESC_L_MASK) || (e2 & DESC_B_MASK)) |
902 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); | 902 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); |
903 | if ((!(e2 & DESC_C_MASK) && dpl < cpl) || ist != 0) { | 903 | if ((!(e2 & DESC_C_MASK) && dpl < cpl) || ist != 0) { |
904 | - /* to inner priviledge */ | 904 | + /* to inner privilege */ |
905 | if (ist != 0) | 905 | if (ist != 0) |
906 | esp = get_rsp_from_tss(ist + 3); | 906 | esp = get_rsp_from_tss(ist + 3); |
907 | else | 907 | else |
@@ -910,7 +910,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, | @@ -910,7 +910,7 @@ static void do_interrupt64(int intno, int is_int, int error_code, | ||
910 | ss = 0; | 910 | ss = 0; |
911 | new_stack = 1; | 911 | new_stack = 1; |
912 | } else if ((e2 & DESC_C_MASK) || dpl == cpl) { | 912 | } else if ((e2 & DESC_C_MASK) || dpl == cpl) { |
913 | - /* to same priviledge */ | 913 | + /* to same privilege */ |
914 | if (env->eflags & VM_MASK) | 914 | if (env->eflags & VM_MASK) |
915 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); | 915 | raise_exception_err(EXCP0D_GPF, selector & 0xfffc); |
916 | new_stack = 0; | 916 | new_stack = 0; |
@@ -2208,7 +2208,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | @@ -2208,7 +2208,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | ||
2208 | raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); | 2208 | raise_exception_err(EXCP0B_NOSEG, selector & 0xfffc); |
2209 | 2209 | ||
2210 | if (!(e2 & DESC_C_MASK) && dpl < cpl) { | 2210 | if (!(e2 & DESC_C_MASK) && dpl < cpl) { |
2211 | - /* to inner priviledge */ | 2211 | + /* to inner privilege */ |
2212 | get_ss_esp_from_tss(&ss, &sp, dpl); | 2212 | get_ss_esp_from_tss(&ss, &sp, dpl); |
2213 | #ifdef DEBUG_PCALL | 2213 | #ifdef DEBUG_PCALL |
2214 | if (loglevel & CPU_LOG_PCALL) | 2214 | if (loglevel & CPU_LOG_PCALL) |
@@ -2255,7 +2255,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | @@ -2255,7 +2255,7 @@ void helper_lcall_protected_T0_T1(int shift, int next_eip_addend) | ||
2255 | } | 2255 | } |
2256 | new_stack = 1; | 2256 | new_stack = 1; |
2257 | } else { | 2257 | } else { |
2258 | - /* to same priviledge */ | 2258 | + /* to same privilege */ |
2259 | sp = ESP; | 2259 | sp = ESP; |
2260 | sp_mask = get_sp_mask(env->segs[R_SS].flags); | 2260 | sp_mask = get_sp_mask(env->segs[R_SS].flags); |
2261 | ssp = env->segs[R_SS].base; | 2261 | ssp = env->segs[R_SS].base; |
@@ -2437,7 +2437,7 @@ static inline void helper_ret_protected(int shift, int is_iret, int addend) | @@ -2437,7 +2437,7 @@ static inline void helper_ret_protected(int shift, int is_iret, int addend) | ||
2437 | get_seg_limit(e1, e2), | 2437 | get_seg_limit(e1, e2), |
2438 | e2); | 2438 | e2); |
2439 | } else { | 2439 | } else { |
2440 | - /* return to different priviledge level */ | 2440 | + /* return to different privilege level */ |
2441 | #ifdef TARGET_X86_64 | 2441 | #ifdef TARGET_X86_64 |
2442 | if (shift == 2) { | 2442 | if (shift == 2) { |
2443 | POPQ(sp, new_esp); | 2443 | POPQ(sp, new_esp); |
target-i386/translate.c
@@ -2245,7 +2245,7 @@ static void gen_exception(DisasContext *s, int trapno, target_ulong cur_eip) | @@ -2245,7 +2245,7 @@ static void gen_exception(DisasContext *s, int trapno, target_ulong cur_eip) | ||
2245 | } | 2245 | } |
2246 | 2246 | ||
2247 | /* an interrupt is different from an exception because of the | 2247 | /* an interrupt is different from an exception because of the |
2248 | - priviledge checks */ | 2248 | + privilege checks */ |
2249 | static void gen_interrupt(DisasContext *s, int intno, | 2249 | static void gen_interrupt(DisasContext *s, int intno, |
2250 | target_ulong cur_eip, target_ulong next_eip) | 2250 | target_ulong cur_eip, target_ulong next_eip) |
2251 | { | 2251 | { |
target-ppc/translate.c
@@ -3026,10 +3026,10 @@ static inline void gen_op_mfspr (DisasContext *ctx) | @@ -3026,10 +3026,10 @@ static inline void gen_op_mfspr (DisasContext *ctx) | ||
3026 | } else { | 3026 | } else { |
3027 | /* Privilege exception */ | 3027 | /* Privilege exception */ |
3028 | if (loglevel != 0) { | 3028 | if (loglevel != 0) { |
3029 | - fprintf(logfile, "Trying to read priviledged spr %d %03x\n", | 3029 | + fprintf(logfile, "Trying to read privileged spr %d %03x\n", |
3030 | sprn, sprn); | 3030 | sprn, sprn); |
3031 | } | 3031 | } |
3032 | - printf("Trying to read priviledged spr %d %03x\n", sprn, sprn); | 3032 | + printf("Trying to read privileged spr %d %03x\n", sprn, sprn); |
3033 | RET_PRIVREG(ctx); | 3033 | RET_PRIVREG(ctx); |
3034 | } | 3034 | } |
3035 | } else { | 3035 | } else { |
@@ -3132,10 +3132,10 @@ GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000001, PPC_MISC) | @@ -3132,10 +3132,10 @@ GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000001, PPC_MISC) | ||
3132 | } else { | 3132 | } else { |
3133 | /* Privilege exception */ | 3133 | /* Privilege exception */ |
3134 | if (loglevel != 0) { | 3134 | if (loglevel != 0) { |
3135 | - fprintf(logfile, "Trying to write priviledged spr %d %03x\n", | 3135 | + fprintf(logfile, "Trying to write privileged spr %d %03x\n", |
3136 | sprn, sprn); | 3136 | sprn, sprn); |
3137 | } | 3137 | } |
3138 | - printf("Trying to write priviledged spr %d %03x\n", sprn, sprn); | 3138 | + printf("Trying to write privileged spr %d %03x\n", sprn, sprn); |
3139 | RET_PRIVREG(ctx); | 3139 | RET_PRIVREG(ctx); |
3140 | } | 3140 | } |
3141 | } else { | 3141 | } else { |
@@ -4019,7 +4019,7 @@ GEN_HANDLER(clf, 0x1F, 0x16, 0x03, 0x03E00000, PPC_POWER) | @@ -4019,7 +4019,7 @@ GEN_HANDLER(clf, 0x1F, 0x16, 0x03, 0x03E00000, PPC_POWER) | ||
4019 | /* cli */ | 4019 | /* cli */ |
4020 | GEN_HANDLER(cli, 0x1F, 0x16, 0x0F, 0x03E00000, PPC_POWER) | 4020 | GEN_HANDLER(cli, 0x1F, 0x16, 0x0F, 0x03E00000, PPC_POWER) |
4021 | { | 4021 | { |
4022 | - /* Cache line invalidate: priviledged and treated as no-op */ | 4022 | + /* Cache line invalidate: privileged and treated as no-op */ |
4023 | #if defined(CONFIG_USER_ONLY) | 4023 | #if defined(CONFIG_USER_ONLY) |
4024 | RET_PRIVOPC(ctx); | 4024 | RET_PRIVOPC(ctx); |
4025 | #else | 4025 | #else |