diff options
| -rw-r--r-- | darwin-user/mmap.c | 2 | ||||
| -rw-r--r-- | disas.c | 2 | ||||
| -rw-r--r-- | exec.c | 2 | ||||
| -rw-r--r-- | hw/cirrus_vga.c | 2 | ||||
| -rw-r--r-- | hw/cuda.c | 4 | ||||
| -rw-r--r-- | hw/ne2000.c | 6 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 2 | ||||
| -rw-r--r-- | hw/vga.c | 2 | ||||
| -rw-r--r-- | linux-user/elfload.c | 4 | ||||
| -rw-r--r-- | sdl.c | 3 | ||||
| -rw-r--r-- | target-i386/translate.c | 2 |
11 files changed, 16 insertions, 15 deletions
diff --git a/darwin-user/mmap.c b/darwin-user/mmap.c index ada613d361..b4055abe1b 100644 --- a/darwin-user/mmap.c +++ b/darwin-user/mmap.c @@ -199,7 +199,7 @@ long target_mmap(unsigned long start, unsigned long len, int prot, if (!(flags & MAP_FIXED)) { #if defined(__alpha__) || defined(__sparc__) || defined(__x86_64__) - /* tell the kenel to search at the same place as i386 */ + /* tell the kernel to search at the same place as i386 */ if (host_start == 0) { host_start = last_start; last_start += HOST_PAGE_ALIGN(len); diff --git a/disas.c b/disas.c index fd14f682ae..2642c778dd 100644 --- a/disas.c +++ b/disas.c @@ -134,7 +134,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info) } #endif -/* Disassemble this for me please... (debugging). 'flags' has teh following +/* Disassemble this for me please... (debugging). 'flags' has the following values: i386 - nonzero means 16 bit code arm - nonzero means thumb code diff --git a/exec.c b/exec.c index 61d8f61ab5..0e415a5e9b 100644 --- a/exec.c +++ b/exec.c @@ -1220,7 +1220,7 @@ CPULogItem cpu_log_items[] = { { CPU_LOG_EXEC, "exec", "show trace before each executed TB (lots of logs)" }, { CPU_LOG_TB_CPU, "cpu", - "show CPU state before bloc translation" }, + "show CPU state before block translation" }, #ifdef TARGET_I386 { CPU_LOG_PCALL, "pcall", "show protected mode far calls/returns/exceptions" }, diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 2cbafe1745..e5b0cfb653 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2784,7 +2784,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) case 0x09: case 0x0c: case 0x0d: - case 0x12: /* veritcal display end */ + case 0x12: /* vertical display end */ s->cr[s->cr_index] = val; break; diff --git a/hw/cuda.c b/hw/cuda.c index c290450785..dc143e2052 100644 --- a/hw/cuda.c +++ b/hw/cuda.c @@ -445,9 +445,9 @@ static void cuda_update(CUDAState *s) cuda_update_irq(s); } else { if (!(s->last_b & TIP)) { - /* handle end of host to cuda transfert */ + /* handle end of host to cuda transfer */ packet_received = (s->data_out_index > 0); - /* always an IRQ at the end of transfert */ + /* always an IRQ at the end of transfer */ s->ifr |= SR_INT; cuda_update_irq(s); } diff --git a/hw/ne2000.c b/hw/ne2000.c index 1830ab5482..1625c55388 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -325,7 +325,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) s->cmd = val; if (!(val & E8390_STOP)) { /* START bit makes no sense on RTL8029... */ s->isr &= ~ENISR_RESET; - /* test specific case: zero length transfert */ + /* test specific case: zero length transfer */ if ((val & (E8390_RREAD | E8390_RWRITE)) && s->rcnt == 0) { s->isr |= ENISR_RDC; @@ -340,7 +340,7 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) if (index + s->tcnt <= NE2000_PMEM_END) { qemu_send_packet(s->vc, s->mem + index, s->tcnt); } - /* signal end of transfert */ + /* signal end of transfer */ s->tsr = ENTSR_PTX; s->isr |= ENISR_TX; s->cmd &= ~E8390_TRANS; @@ -550,7 +550,7 @@ static inline void ne2000_dma_update(NE2000State *s, int len) if (s->rcnt <= len) { s->rcnt = 0; - /* signal end of transfert */ + /* signal end of transfer */ s->isr |= ENISR_RDC; ne2000_update_irq(s); } else { diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 92f745726f..384c098a09 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -489,7 +489,7 @@ int32_t scsi_send_command(SCSIDevice *s, uint32_t tag, uint8_t *buf, int lun) is_write = 1; break; case 0x35: - DPRINTF("Syncronise cache (sector %d, count %d)\n", lba, len); + DPRINTF("Synchronise cache (sector %d, count %d)\n", lba, len); bdrv_flush(s->bdrv); break; case 0x43: diff --git a/hw/vga.c b/hw/vga.c index 9dbbfe2379..8661d00d35 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -346,7 +346,7 @@ static void vga_ioport_write(void *opaque, uint32_t addr, uint32_t val) case 0x09: case 0x0c: case 0x0d: - case 0x12: /* veritcal display end */ + case 0x12: /* vertical display end */ s->cr[s->cr_index] = val; break; default: diff --git a/linux-user/elfload.c b/linux-user/elfload.c index c1306929cb..c0845fe650 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -799,7 +799,7 @@ static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, #endif if (interp_elf_ex->e_type == ET_DYN) { - /* in order to avoid harcoding the interpreter load + /* in order to avoid hardcoding the interpreter load address in qemu, we allocate a big enough memory zone */ error = target_mmap(0, INTERP_MAP_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANON, @@ -1191,7 +1191,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, base, as well as whatever program they might try to exec. This is because the brk will follow the loader, and is not movable. */ /* NOTE: for qemu, we do a big mmap to get enough space - without harcoding any address */ + without hardcoding any address */ error = target_mmap(0, ET_DYN_MAP_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0); diff --git a/sdl.c b/sdl.c index 6c30db146d..dc11937cf2 100644 --- a/sdl.c +++ b/sdl.c @@ -407,7 +407,8 @@ static void sdl_refresh(DisplayState *ds) case SDLK_END: keysym = QEMU_KEY_END; break; case SDLK_PAGEUP: keysym = QEMU_KEY_PAGEUP; break; case SDLK_PAGEDOWN: keysym = QEMU_KEY_PAGEDOWN; break; - case SDLK_BACKSPACE: keysym = QEMU_KEY_BACKSPACE; break; case SDLK_DELETE: keysym = QEMU_KEY_DELETE; break; + case SDLK_BACKSPACE: keysym = QEMU_KEY_BACKSPACE; break; + case SDLK_DELETE: keysym = QEMU_KEY_DELETE; break; default: break; } } diff --git a/target-i386/translate.c b/target-i386/translate.c index e36e03d820..96e72c9dd8 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -6431,7 +6431,7 @@ static void optimize_flags(uint16_t *opc_buf, int opc_buf_len) opc_ptr = opc_buf + opc_buf_len; /* live_flags contains the flags needed by the next instructions - in the code. At the end of the bloc, we consider that all the + in the code. At the end of the block, we consider that all the flags are live. */ live_flags = CC_OSZAPC; while (opc_ptr > opc_buf) { |