Commit e91c8a778349982eb49fd319ab6506911e2d837e
1 parent
6d9db39c
Spelling fixes, by Stefan Weil.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2927 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
11 changed files
with
16 additions
and
15 deletions
darwin-user/mmap.c
| @@ -199,7 +199,7 @@ long target_mmap(unsigned long start, unsigned long len, int prot, | @@ -199,7 +199,7 @@ long target_mmap(unsigned long start, unsigned long len, int prot, | ||
| 199 | 199 | ||
| 200 | if (!(flags & MAP_FIXED)) { | 200 | if (!(flags & MAP_FIXED)) { |
| 201 | #if defined(__alpha__) || defined(__sparc__) || defined(__x86_64__) | 201 | #if defined(__alpha__) || defined(__sparc__) || defined(__x86_64__) |
| 202 | - /* tell the kenel to search at the same place as i386 */ | 202 | + /* tell the kernel to search at the same place as i386 */ |
| 203 | if (host_start == 0) { | 203 | if (host_start == 0) { |
| 204 | host_start = last_start; | 204 | host_start = last_start; |
| 205 | last_start += HOST_PAGE_ALIGN(len); | 205 | last_start += HOST_PAGE_ALIGN(len); |
disas.c
| @@ -134,7 +134,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info) | @@ -134,7 +134,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info) | ||
| 134 | } | 134 | } |
| 135 | #endif | 135 | #endif |
| 136 | 136 | ||
| 137 | -/* Disassemble this for me please... (debugging). 'flags' has teh following | 137 | +/* Disassemble this for me please... (debugging). 'flags' has the following |
| 138 | values: | 138 | values: |
| 139 | i386 - nonzero means 16 bit code | 139 | i386 - nonzero means 16 bit code |
| 140 | arm - nonzero means thumb code | 140 | arm - nonzero means thumb code |
exec.c
| @@ -1220,7 +1220,7 @@ CPULogItem cpu_log_items[] = { | @@ -1220,7 +1220,7 @@ CPULogItem cpu_log_items[] = { | ||
| 1220 | { CPU_LOG_EXEC, "exec", | 1220 | { CPU_LOG_EXEC, "exec", |
| 1221 | "show trace before each executed TB (lots of logs)" }, | 1221 | "show trace before each executed TB (lots of logs)" }, |
| 1222 | { CPU_LOG_TB_CPU, "cpu", | 1222 | { CPU_LOG_TB_CPU, "cpu", |
| 1223 | - "show CPU state before bloc translation" }, | 1223 | + "show CPU state before block translation" }, |
| 1224 | #ifdef TARGET_I386 | 1224 | #ifdef TARGET_I386 |
| 1225 | { CPU_LOG_PCALL, "pcall", | 1225 | { CPU_LOG_PCALL, "pcall", |
| 1226 | "show protected mode far calls/returns/exceptions" }, | 1226 | "show protected mode far calls/returns/exceptions" }, |
hw/cirrus_vga.c
| @@ -2784,7 +2784,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) | @@ -2784,7 +2784,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) | ||
| 2784 | case 0x09: | 2784 | case 0x09: |
| 2785 | case 0x0c: | 2785 | case 0x0c: |
| 2786 | case 0x0d: | 2786 | case 0x0d: |
| 2787 | - case 0x12: /* veritcal display end */ | 2787 | + case 0x12: /* vertical display end */ |
| 2788 | s->cr[s->cr_index] = val; | 2788 | s->cr[s->cr_index] = val; |
| 2789 | break; | 2789 | break; |
| 2790 | 2790 |
hw/cuda.c
| @@ -445,9 +445,9 @@ static void cuda_update(CUDAState *s) | @@ -445,9 +445,9 @@ static void cuda_update(CUDAState *s) | ||
| 445 | cuda_update_irq(s); | 445 | cuda_update_irq(s); |
| 446 | } else { | 446 | } else { |
| 447 | if (!(s->last_b & TIP)) { | 447 | if (!(s->last_b & TIP)) { |
| 448 | - /* handle end of host to cuda transfert */ | 448 | + /* handle end of host to cuda transfer */ |
| 449 | packet_received = (s->data_out_index > 0); | 449 | packet_received = (s->data_out_index > 0); |
| 450 | - /* always an IRQ at the end of transfert */ | 450 | + /* always an IRQ at the end of transfer */ |
| 451 | s->ifr |= SR_INT; | 451 | s->ifr |= SR_INT; |
| 452 | cuda_update_irq(s); | 452 | cuda_update_irq(s); |
| 453 | } | 453 | } |
hw/ne2000.c
| @@ -325,7 +325,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) | @@ -325,7 +325,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) | ||
| 325 | s->cmd = val; | 325 | s->cmd = val; |
| 326 | if (!(val & E8390_STOP)) { /* START bit makes no sense on RTL8029... */ | 326 | if (!(val & E8390_STOP)) { /* START bit makes no sense on RTL8029... */ |
| 327 | s->isr &= ~ENISR_RESET; | 327 | s->isr &= ~ENISR_RESET; |
| 328 | - /* test specific case: zero length transfert */ | 328 | + /* test specific case: zero length transfer */ |
| 329 | if ((val & (E8390_RREAD | E8390_RWRITE)) && | 329 | if ((val & (E8390_RREAD | E8390_RWRITE)) && |
| 330 | s->rcnt == 0) { | 330 | s->rcnt == 0) { |
| 331 | s->isr |= ENISR_RDC; | 331 | s->isr |= ENISR_RDC; |
| @@ -340,7 +340,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) | @@ -340,7 +340,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) | ||
| 340 | if (index + s->tcnt <= NE2000_PMEM_END) { | 340 | if (index + s->tcnt <= NE2000_PMEM_END) { |
| 341 | qemu_send_packet(s->vc, s->mem + index, s->tcnt); | 341 | qemu_send_packet(s->vc, s->mem + index, s->tcnt); |
| 342 | } | 342 | } |
| 343 | - /* signal end of transfert */ | 343 | + /* signal end of transfer */ |
| 344 | s->tsr = ENTSR_PTX; | 344 | s->tsr = ENTSR_PTX; |
| 345 | s->isr |= ENISR_TX; | 345 | s->isr |= ENISR_TX; |
| 346 | s->cmd &= ~E8390_TRANS; | 346 | s->cmd &= ~E8390_TRANS; |
| @@ -550,7 +550,7 @@ static inline void ne2000_dma_update(NE2000State *s, int len) | @@ -550,7 +550,7 @@ static inline void ne2000_dma_update(NE2000State *s, int len) | ||
| 550 | 550 | ||
| 551 | if (s->rcnt <= len) { | 551 | if (s->rcnt <= len) { |
| 552 | s->rcnt = 0; | 552 | s->rcnt = 0; |
| 553 | - /* signal end of transfert */ | 553 | + /* signal end of transfer */ |
| 554 | s->isr |= ENISR_RDC; | 554 | s->isr |= ENISR_RDC; |
| 555 | ne2000_update_irq(s); | 555 | ne2000_update_irq(s); |
| 556 | } else { | 556 | } else { |
hw/scsi-disk.c
| @@ -489,7 +489,7 @@ int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int lun) | @@ -489,7 +489,7 @@ int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int lun) | ||
| 489 | is_write = 1; | 489 | is_write = 1; |
| 490 | break; | 490 | break; |
| 491 | case 0x35: | 491 | case 0x35: |
| 492 | - DPRINTF("Syncronise cache (sector %d, count %d)\n", lba, len); | 492 | + DPRINTF("Synchronise cache (sector %d, count %d)\n", lba, len); |
| 493 | bdrv_flush(s->bdrv); | 493 | bdrv_flush(s->bdrv); |
| 494 | break; | 494 | break; |
| 495 | case 0x43: | 495 | case 0x43: |
hw/vga.c
| @@ -346,7 +346,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) | @@ -346,7 +346,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) | ||
| 346 | case 0x09: | 346 | case 0x09: |
| 347 | case 0x0c: | 347 | case 0x0c: |
| 348 | case 0x0d: | 348 | case 0x0d: |
| 349 | - case 0x12: /* veritcal display end */ | 349 | + case 0x12: /* vertical display end */ |
| 350 | s->cr[s->cr_index] = val; | 350 | s->cr[s->cr_index] = val; |
| 351 | break; | 351 | break; |
| 352 | default: | 352 | default: |
linux-user/elfload.c
| @@ -799,7 +799,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, | @@ -799,7 +799,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, | ||
| 799 | #endif | 799 | #endif |
| 800 | 800 | ||
| 801 | if (interp_elf_ex->e_type == ET_DYN) { | 801 | if (interp_elf_ex->e_type == ET_DYN) { |
| 802 | - /* in order to avoid harcoding the interpreter load | 802 | + /* in order to avoid hardcoding the interpreter load |
| 803 | address in qemu, we allocate a big enough memory zone */ | 803 | address in qemu, we allocate a big enough memory zone */ |
| 804 | error = target_mmap(0, INTERP_MAP_SIZE, | 804 | error = target_mmap(0, INTERP_MAP_SIZE, |
| 805 | PROT_NONE, MAP_PRIVATE | MAP_ANON, | 805 | PROT_NONE, MAP_PRIVATE | MAP_ANON, |
| @@ -1191,7 +1191,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, | @@ -1191,7 +1191,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, | ||
| 1191 | base, as well as whatever program they might try to exec. This | 1191 | base, as well as whatever program they might try to exec. This |
| 1192 | is because the brk will follow the loader, and is not movable. */ | 1192 | is because the brk will follow the loader, and is not movable. */ |
| 1193 | /* NOTE: for qemu, we do a big mmap to get enough space | 1193 | /* NOTE: for qemu, we do a big mmap to get enough space |
| 1194 | - without harcoding any address */ | 1194 | + without hardcoding any address */ |
| 1195 | error = target_mmap(0, ET_DYN_MAP_SIZE, | 1195 | error = target_mmap(0, ET_DYN_MAP_SIZE, |
| 1196 | PROT_NONE, MAP_PRIVATE | MAP_ANON, | 1196 | PROT_NONE, MAP_PRIVATE | MAP_ANON, |
| 1197 | -1, 0); | 1197 | -1, 0); |
sdl.c
| @@ -407,7 +407,8 @@ static void sdl_refresh(DisplayState *ds) | @@ -407,7 +407,8 @@ static void sdl_refresh(DisplayState *ds) | ||
| 407 | case SDLK_END: keysym = QEMU_KEY_END; break; | 407 | case SDLK_END: keysym = QEMU_KEY_END; break; |
| 408 | case SDLK_PAGEUP: keysym = QEMU_KEY_PAGEUP; break; | 408 | case SDLK_PAGEUP: keysym = QEMU_KEY_PAGEUP; break; |
| 409 | case SDLK_PAGEDOWN: keysym = QEMU_KEY_PAGEDOWN; break; | 409 | case SDLK_PAGEDOWN: keysym = QEMU_KEY_PAGEDOWN; break; |
| 410 | - case SDLK_BACKSPACE: keysym = QEMU_KEY_BACKSPACE; break; case SDLK_DELETE: keysym = QEMU_KEY_DELETE; break; | 410 | + case SDLK_BACKSPACE: keysym = QEMU_KEY_BACKSPACE; break; |
| 411 | + case SDLK_DELETE: keysym = QEMU_KEY_DELETE; break; | ||
| 411 | default: break; | 412 | default: break; |
| 412 | } | 413 | } |
| 413 | } | 414 | } |
target-i386/translate.c
| @@ -6431,7 +6431,7 @@ static void optimize_flags(uint16_t *opc_buf, int opc_buf_len) | @@ -6431,7 +6431,7 @@ static void optimize_flags(uint16_t *opc_buf, int opc_buf_len) | ||
| 6431 | 6431 | ||
| 6432 | opc_ptr = opc_buf + opc_buf_len; | 6432 | opc_ptr = opc_buf + opc_buf_len; |
| 6433 | /* live_flags contains the flags needed by the next instructions | 6433 | /* live_flags contains the flags needed by the next instructions |
| 6434 | - in the code. At the end of the bloc, we consider that all the | 6434 | + in the code. At the end of the block, we consider that all the |
| 6435 | flags are live. */ | 6435 | flags are live. */ |
| 6436 | live_flags = CC_OSZAPC; | 6436 | live_flags = CC_OSZAPC; |
| 6437 | while (opc_ptr > opc_buf) { | 6437 | while (opc_ptr > opc_buf) { |