[PATCH 09/18] xfree86: fix spelling mistakes

Eric Engestrom eric at engestrom.ch
Sat Apr 2 18:53:22 UTC 2016


Signed-off-by: Eric Engestrom <eric at engestrom.ch>
---
 hw/xfree86/common/xf86Cursor.c           |  2 +-
 hw/xfree86/common/xf86Events.c           |  2 +-
 hw/xfree86/common/xf86Helper.c           |  2 +-
 hw/xfree86/common/xf86pciBus.c           |  2 +-
 hw/xfree86/dri/dri.c                     |  2 +-
 hw/xfree86/dri2/dri2.h                   |  2 +-
 hw/xfree86/dri2/dri2ext.c                |  2 +-
 hw/xfree86/drivers/modesetting/present.c |  4 ++--
 hw/xfree86/i2c/xf86i2c.c                 |  8 ++++----
 hw/xfree86/int10/INT10.HOWTO             |  2 +-
 hw/xfree86/int10/generic.c               |  2 +-
 hw/xfree86/int10/helper_exec.c           |  2 +-
 hw/xfree86/modes/xf86Cursors.c           |  2 +-
 hw/xfree86/modes/xf86EdidModes.c         |  4 ++--
 hw/xfree86/os-support/bsd/bsd_apm.c      |  2 +-
 hw/xfree86/os-support/bsd/bsd_init.c     |  6 +++---
 hw/xfree86/os-support/bsd/memrange.h     |  2 +-
 hw/xfree86/os-support/xf86_OSproc.h      |  4 ++--
 hw/xfree86/parser/Configint.h            |  2 +-
 hw/xfree86/parser/write.c                |  2 +-
 hw/xfree86/ramdac/CURSOR.NOTES           |  2 +-
 hw/xfree86/sdksyms.sh                    |  2 +-
 hw/xfree86/utils/cvt/cvt.c               |  2 +-
 hw/xfree86/vbe/vbe.c                     |  4 ++--
 hw/xfree86/vgahw/vgaHW.h                 |  2 +-
 hw/xfree86/x86emu/decode.c               |  2 +-
 hw/xfree86/x86emu/ops.c                  | 14 +++++++-------
 hw/xfree86/x86emu/prim_ops.c             | 12 ++++++------
 hw/xfree86/x86emu/x86emu/debug.h         |  2 +-
 29 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 92c08af..5e859d1 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -138,7 +138,7 @@ xf86PointerMoved(ScrnInfoPtr pScr, int x, int y)
 
     /*
      * check wether (x,y) belongs to the visual part of the screen
-     * if not, change the base of the displayed frame accoring
+     * if not, change the base of the displayed frame according
      */
     if (pScr->frameX0 > x) {
         pScr->frameX0 = x;
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 709afd6..35a27b8 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -391,7 +391,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
     /*
      * Hmm... here is the biggest hack of every time !
      * It may be possible that a switch-vt procedure has finished BEFORE
-     * you released all keys neccessary to do this. That peculiar behavior
+     * you released all keys necessary to do this. That peculiar behavior
      * can fool the X-server pretty much, cause it assumes that some keys
      * were not released. TWM may stuck alsmost completly....
      * OK, what we are doing here is after returning from the vt-switch
diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 3b01a49..b142a5b 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -894,7 +894,7 @@ xf86SetGamma(ScrnInfoPtr scrp, Gamma gamma)
         scrp->gamma.red = SET_GAMMA(DDC->features.gamma);
         scrp->gamma.green = SET_GAMMA(DDC->features.gamma);
         scrp->gamma.blue = SET_GAMMA(DDC->features.gamma);
-        /* EDID structure version 2 gives optional seperate red, green & blue gamma values
+        /* EDID structure version 2 gives optional separate red, green & blue gamma values
          * in bytes 0x57-0x59 */
 #endif
     }
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 8158c2b..5cf3a30 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -629,7 +629,7 @@ struct Inst {
  * \param devList        List of Device sections parsed from the config file.
  * \param numDevs        Number of entries in \c devList.
  * \param drvp           Pointer the driver's control structure.
- * \param foundEntities  Returned list of entity indicies associated with the
+ * \param foundEntities  Returned list of entity indices associated with the
  *                       driver.
  *
  * \returns
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 0046e52..4e0e38a 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1698,7 +1698,7 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
         return;
     }
 
-    /* usefull for debugging, just print out after n context switches */
+    /* useful for debugging, just print out after n context switches */
     if (!count || !(count % 1)) {
         DRIDrvMsg(pScreen->myNum, X_INFO,
                   "[DRI] Context switch %5d from %p/0x%08x (%d)\n",
diff --git a/hw/xfree86/dri2/dri2.h b/hw/xfree86/dri2/dri2.h
index 1e7afdd..5278ec7 100644
--- a/hw/xfree86/dri2/dri2.h
+++ b/hw/xfree86/dri2/dri2.h
@@ -305,7 +305,7 @@ extern _X_EXPORT int DRI2CopyRegion(DrawablePtr pDraw,
  * \note
  * This interface was added some time after the initial release of the DRI2
  * module.  Layered modules that wish to use this interface must first test
- * its existance by calling \c xf86LoaderCheckSymbol.
+ * its existence by calling \c xf86LoaderCheckSymbol.
  */
 extern _X_EXPORT void DRI2Version(int *major, int *minor);
 
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 520b7cf..b6e58ff 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -344,7 +344,7 @@ ProcDRI2CopyRegion(ClientPtr client)
     /* CopyRegion needs to be a round trip to make sure the X server
      * queues the swap buffer rendering commands before the DRI client
      * continues rendering.  The reply has a bitmask to signal the
-     * presense of optional return values as well, but we're not using
+     * presence of optional return values as well, but we're not using
      * that yet.
      */
 
diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
index d65c8c8..fc4c03f 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -244,7 +244,7 @@ struct ms_flipdata {
 };
 
 /*
- * Per crtc pageflipping infomation,
+ * Per crtc pageflipping information,
  * These are submitted to the queuing code
  * one of them per crtc per flip.
  */
@@ -386,7 +386,7 @@ queue_flip_on_crtc(ScreenPtr screen, xf86CrtcPtr crtc,
         xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue retry\n");
     }
 
-    /* The page flip succeded. */
+    /* The page flip succeeded. */
     return TRUE;
 }
 
diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
index 2a8b8df..bb94725 100644
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -401,7 +401,7 @@ xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr)
  * 3rd, if a Start condition has been successfully sent,
  *   Send a Stop condition.
  *
- * The functions exits immediately when an error occures,
+ * The functions exits immediately when an error occurs,
  * not proceeding any data left. However, step 3 will
  * be executed anyway to leave the bus in clean idle state.
  */
@@ -440,7 +440,7 @@ I2CWriteRead(I2CDevPtr d,
     return r;
 }
 
-/* wrapper - for compatibility and convinience */
+/* wrapper - for compatibility and convenience */
 
 Bool
 xf86I2CWriteRead(I2CDevPtr d,
@@ -592,7 +592,7 @@ xf86I2CWriteVec(I2CDevPtr d, I2CByte * vec, int nValues)
  * =========================
  */
 
-/* Allocates an I2CDevRec for you and initializes with propper defaults
+/* Allocates an I2CDevRec for you and initializes with proper defaults
  * you may modify before calling xf86I2CDevInit. Your I2CDevRec must
  * contain at least a SlaveAddr, and a pI2CBus pointer to the bus this
  * device shall be linked to.
@@ -692,7 +692,7 @@ xf86I2CFindDev(I2CBusPtr b, I2CSlaveAddr addr)
 
 static I2CBusPtr I2CBusList;
 
-/* Allocates an I2CBusRec for you and initializes with propper defaults
+/* Allocates an I2CBusRec for you and initializes with proper defaults
  * you may modify before calling xf86I2CBusInit. Your I2CBusRec must
  * contain at least a BusName, a scrnIndex (or -1), and a complete set
  * of either high or low level I2C function pointers. You may pass
diff --git a/hw/xfree86/int10/INT10.HOWTO b/hw/xfree86/int10/INT10.HOWTO
index e2154c1..38ef535 100644
--- a/hw/xfree86/int10/INT10.HOWTO
+++ b/hw/xfree86/int10/INT10.HOWTO
@@ -96,7 +96,7 @@ for the INT10 executor:
  starting at address  0 in the process virtual  memory space.  Thus if
  this mode is to be used, the OS environment has to be able to provide
  that, ie. it must be able to remap the processes virtual memory space
- onto itself.  If the  emulator is able  to handle memory  access thru
+ onto itself.  If the  emulator is able  to handle memory  access through
  externally  provided functions the  real mode  process memory  can be
  located anywhere  in the processes  virtual memory. It does  not even
  have to be consecutive.
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 8d5c4da..1811efb 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -223,7 +223,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
     setup_int_vect(pInt);
     set_return_trap(pInt);
 
-    /* Retrieve the entire legacy video BIOS segment.  This can be upto
+    /* Retrieve the entire legacy video BIOS segment.  This can be up to
      * 128KiB.
      */
     vbiosMem = (char *) base + V_BIOS;
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 6a83f42..e54c1f4 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -662,7 +662,7 @@ bios_checksum(const uint8_t *start, int size)
  * monochrome card. This might cause some drivers to choke.
  * To avoid this we attempt legacy VGA by writing to all know VGA
  * disable registers before we call the BIOS initialization and
- * restore the original values afterwards. In beween we hold our
+ * restore the original values afterwards. In between we hold our
  * breath. To get to a (possibly exising) ISA card need to disable
  * our current PCI card.
  */
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 5df1ab7..014ed0f 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -374,7 +374,7 @@ xf86CrtcTransformCursorPos(xf86CrtcPtr crtc, int *x, int *y)
     v.v[1] = (*y + ScreenPriv->HotY) + 0.5;
     v.v[2] = 1;
     pixman_f_transform_point(&crtc->f_framebuffer_to_crtc, &v);
-    /* cursor will have 0.5 added to it already so floor is sufficent */
+    /* cursor will have 0.5 added to it already so floor is sufficient */
     *x = floor(v.v[0]);
     *y = floor(v.v[1]);
     /*
diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c
index f24294e..685e557 100644
--- a/hw/xfree86/modes/xf86EdidModes.c
+++ b/hw/xfree86/modes/xf86EdidModes.c
@@ -557,7 +557,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
      * Refuse to create modes that are insufficiently large.  64 is a random
      * number, maybe the spec says something about what the minimum is.  In
      * particular I see this frequently with _old_ EDID, 1.0 or so, so maybe
-     * our parser is just being too aggresive there.
+     * our parser is just being too aggressive there.
      */
     if (timing->h_active < 64 || timing->v_active < 64) {
         xf86DrvMsg(scrnIndex, X_INFO,
@@ -573,7 +573,7 @@ DDCModeFromDetailedTiming(int scrnIndex, struct detailed_timings *timing,
         return NULL;
     }
 
-    /* We only do seperate sync currently */
+    /* We only do separate sync currently */
     if (timing->sync != 0x03) {
         xf86DrvMsg(scrnIndex, X_INFO,
                    "%s: %dx%d Warning: We only handle separate"
diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c
index 60a19d7..f6c3af8 100644
--- a/hw/xfree86/os-support/bsd/bsd_apm.c
+++ b/hw/xfree86/os-support/bsd/bsd_apm.c
@@ -78,7 +78,7 @@ bsdPMGetEventFromOS(int fd, pmEvent * events, int num)
 /*
  * XXX This won't work on /dev/apm !
  *     We should either use /dev/apm_ctl (and kill apmd(8))
- *     or talk to apmd (but its protocol is not publically available)...
+ *     or talk to apmd (but its protocol is not publicly available)...
  */
 static pmWait
 bsdPMConfirmEventToOs(int fd, pmEvent event)
diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 38dfde1..63e29a0 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -102,9 +102,9 @@ static char *supported_drivers[] = {
 };
 
 /*
- * Functions to probe for the existance of a supported console driver.
+ * Functions to probe for the existence of a supported console driver.
  * Any function returns either a valid file descriptor (driver probed
- * succesfully), -1 (driver not found), or uses FatalError() if the
+ * successfully), -1 (driver not found), or uses FatalError() if the
  * driver was found but proved to not support the required mode to run
  * an X server.
  */
@@ -131,7 +131,7 @@ static int xf86OpenWScons(void);
  * The sequence of the driver probes is important; start with the
  * driver that is best distinguishable, and end with the most generic
  * driver.  (Otherwise, pcvt would also probe as syscons, and either
- * pcvt or syscons might succesfully probe as pccons.)
+ * pcvt or syscons might successfully probe as pccons.)
  */
 static xf86ConsOpen_t xf86ConsTab[] = {
 #ifdef PCVT_SUPPORT
diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h
index bacd4aa..49d5627 100644
--- a/hw/xfree86/os-support/bsd/memrange.h
+++ b/hw/xfree86/os-support/bsd/memrange.h
@@ -1,5 +1,5 @@
 /*
- * Memory range attribute operations, peformed on /dev/mem
+ * Memory range attribute operations, performed on /dev/mem
  */
 
 #ifdef HAVE_XORG_CONFIG_H
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index fa3ff0e..5c2c1f3 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -68,9 +68,9 @@
 #define _XF86_OSPROC_H
 
 /*
- * The actual prototypes have been pulled into this seperate file so
+ * The actual prototypes have been pulled into this separate file so
  * that they can can be used without pulling in all of the OS specific
- * stuff like sys/stat.h, etc. This casues problem for loadable modules.
+ * stuff like sys/stat.h, etc. This causes problem for loadable modules.
  */
 
 /*
diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h
index e5fa6ce..035c201 100644
--- a/hw/xfree86/parser/Configint.h
+++ b/hw/xfree86/parser/Configint.h
@@ -126,7 +126,7 @@ else\
  * These are defines for error messages to promote consistency.
  * error messages are preceded by the line number, section and file name,
  * so these messages should be about the specific keyword and syntax in error.
- * To help limit namespace polution, end each with _MSG.
+ * To help limit namespace pollution, end each with _MSG.
  * limit messages to 70 characters if possible.
  */
 
diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c
index 8792783..97b62da 100644
--- a/hw/xfree86/parser/write.c
+++ b/hw/xfree86/parser/write.c
@@ -152,7 +152,7 @@ xf86writeConfigFile(const char *filename, XF86ConfigPtr cptr)
     if (getuid() != geteuid()) {
 
 #if !defined(HAS_SAVED_IDS_AND_SETEUID)
-        /* Need to fork to change ruid without loosing euid */
+        /* Need to fork to change ruid without losing euid */
         csig = signal(SIGCHLD, SIG_DFL);
         switch ((pid = fork())) {
         case -1:
diff --git a/hw/xfree86/ramdac/CURSOR.NOTES b/hw/xfree86/ramdac/CURSOR.NOTES
index 726e2ed..b7cec3a 100644
--- a/hw/xfree86/ramdac/CURSOR.NOTES
+++ b/hw/xfree86/ramdac/CURSOR.NOTES
@@ -46,7 +46,7 @@ void SetCursorPosition(ScrnInfoPtr pScrn, int x, int y)
 void SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
 
     Set the cursor foreground and background colors.  In 8bpp, fg and
-    bg are indicies into the current colormap unless the 
+    bg are indices into the current colormap unless the 
     HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set.  In that case
     and in all other bpps the fg and bg are in 8-8-8 RGB format.
     
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 5391b72..221c631 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -389,7 +389,7 @@ BEGIN {
 		getline;
 	}
 
-	# dont modify $0 or $n
+	# don't modify $0 or $n
 	symbol = $n;
 
 	# remove starting non word chars
diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c
index 9413c20..d923f54 100644
--- a/hw/xfree86/utils/cvt/cvt.c
+++ b/hw/xfree86/utils/cvt/cvt.c
@@ -108,7 +108,7 @@ PrintUsage(char *Name)
     fprintf(stderr, "usage: %s [-v|--verbose] [-r|--reduced] X Y [refresh]\n",
             Name);
     fprintf(stderr, "\n");
-    fprintf(stderr, " -v|--verbose : Warn about CVT standard adherance.\n");
+    fprintf(stderr, " -v|--verbose : Warn about CVT standard adherence.\n");
     fprintf(stderr, " -r|--reduced : Create a mode with reduced blanking "
             "(default: normal blanking).\n");
     fprintf(stderr, "            X : Desired horizontal resolution "
diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c
index d23e0f5..0d79459 100644
--- a/hw/xfree86/vbe/vbe.c
+++ b/hw/xfree86/vbe/vbe.c
@@ -309,7 +309,7 @@ vbeReadEDID(vbeInfoPtr pVbe)
         xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC read failed\n");
         break;
     default:
-        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unkown failure %i\n",
+        xf86DrvMsgVerb(screen, X_INFO, 3, "VESA VBE DDC unknown failure %i\n",
                        pVbe->pInt10->ax & 0xff00);
         break;
     }
@@ -846,7 +846,7 @@ VBEGetVBEpmi(vbeInfoPtr pVbe)
        AX    := Status
        ES    := Real Mode Segment of Table
        DI    := Offset of Table
-       CX    := Lenght of Table including protected mode code in bytes (for copying purposes)
+       CX    := Length of Table including protected mode code in bytes (for copying purposes)
        (All other registers are preserved)
      */
 
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index b979b85..0fa80da 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -83,7 +83,7 @@ typedef struct {
     unsigned char *CRTC;        /* Crtc Controller */
     unsigned char *Sequencer;   /* Video Sequencer */
     unsigned char *Graphics;    /* Video Graphics */
-    unsigned char *Attribute;   /* Video Atribute */
+    unsigned char *Attribute;   /* Video Attribute */
     unsigned char DAC[768];     /* Internal Colorlookuptable */
     unsigned char numCRTC;      /* number of CRTC registers, def=VGA_NUM_CRTC */
     unsigned char numSequencer; /* number of seq registers, def=VGA_NUM_SEQ */
diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index 08a07b1..261d67b 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -269,7 +269,7 @@ cpu-state-varible M.x86.mode. There are several potential states:
 	gs segment override
 	ss segment override
 
-	ds/ss select (in absense of override)
+	ds/ss select (in absence of override)
 
 Each of the above 7 items are handled with a bit in the mode field.
 ****************************************************************************/
diff --git a/hw/xfree86/x86emu/ops.c b/hw/xfree86/x86emu/ops.c
index 210f8ce..316d886 100644
--- a/hw/xfree86/x86emu/ops.c
+++ b/hw/xfree86/x86emu/ops.c
@@ -39,7 +39,7 @@
 * to the 256 byte-"opcodes" found on the 8086.  The table which
 * dispatches this is found in the files optab.[ch].
 *
-* Each opcode proc has a comment preceeding it which gives it's table
+* Each opcode proc has a comment preceding it which gives it's table
 * address.  Several opcodes are missing (undefined) in the table.
 *
 * Each proc includes information for decoding (DECODE_PRINTF and
@@ -7711,7 +7711,7 @@ x86emuOp_movs_byte(u8 X86EMU_UNUSED(op1))
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         count = M.x86.R_CX;
         M.x86.R_CX = 0;
@@ -7756,7 +7756,7 @@ x86emuOp_movs_word(u8 X86EMU_UNUSED(op1))
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         count = M.x86.R_CX;
         M.x86.R_CX = 0;
@@ -7991,7 +7991,7 @@ x86emuOp_stos_byte(u8 X86EMU_UNUSED(op1))
         inc = 1;
     TRACE_AND_STEP();
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         while (M.x86.R_CX != 0) {
             store_data_byte_abs(M.x86.R_ES, M.x86.R_DI, M.x86.R_AL);
@@ -8036,7 +8036,7 @@ x86emuOp_stos_word(u8 X86EMU_UNUSED(op1))
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         count = M.x86.R_CX;
         M.x86.R_CX = 0;
@@ -8072,7 +8072,7 @@ x86emuOp_lods_byte(u8 X86EMU_UNUSED(op1))
     else
         inc = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         while (M.x86.R_CX != 0) {
             M.x86.R_AL = fetch_data_byte(M.x86.R_SI);
@@ -8117,7 +8117,7 @@ x86emuOp_lods_word(u8 X86EMU_UNUSED(op1))
     TRACE_AND_STEP();
     count = 1;
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* move them until CX is ZERO. */
         count = M.x86.R_CX;
         M.x86.R_CX = 0;
diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c
index 5604c7e..afb8831 100644
--- a/hw/xfree86/x86emu/prim_ops.c
+++ b/hw/xfree86/x86emu/prim_ops.c
@@ -2050,7 +2050,7 @@ test_byte(u8 d, u8 s)
     CONDITIONAL_SET_FLAG(res & 0x80, F_SF);
     CONDITIONAL_SET_FLAG(res == 0, F_ZF);
     CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-    /* AF == dont care */
+    /* AF == don't care */
     CLEAR_FLAG(F_CF);
 }
 
@@ -2069,7 +2069,7 @@ test_word(u16 d, u16 s)
     CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
     CONDITIONAL_SET_FLAG(res == 0, F_ZF);
     CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-    /* AF == dont care */
+    /* AF == don't care */
     CLEAR_FLAG(F_CF);
 }
 
@@ -2088,7 +2088,7 @@ test_long(u32 d, u32 s)
     CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
     CONDITIONAL_SET_FLAG(res == 0, F_ZF);
     CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
-    /* AF == dont care */
+    /* AF == don't care */
     CLEAR_FLAG(F_CF);
 }
 
@@ -2597,7 +2597,7 @@ ins(int size)
         inc = -size;
     }
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* in until CX is ZERO. */
         u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
                      M.x86.R_ECX : M.x86.R_CX);
@@ -2663,7 +2663,7 @@ outs(int size)
         inc = -size;
     }
     if (M.x86.mode & (SYSMODE_PREFIX_REPE | SYSMODE_PREFIX_REPNE)) {
-        /* dont care whether REPE or REPNE */
+        /* don't care whether REPE or REPNE */
         /* out until CX is ZERO. */
         u32 count = ((M.x86.mode & SYSMODE_PREFIX_DATA) ?
                      M.x86.R_ECX : M.x86.R_CX);
@@ -2818,7 +2818,7 @@ cpuid(void)
     switch (feature) {
     case 0:
         /* Regardless if we have real data from the hardware, the emulator
-         * will only support upto feature 1, which we set in register EAX.
+         * will only support up to feature 1, which we set in register EAX.
          * Registers EBX:EDX:ECX contain a string identifying the CPU.
          */
         M.x86.R_EAX = 1;
diff --git a/hw/xfree86/x86emu/x86emu/debug.h b/hw/xfree86/x86emu/x86emu/debug.h
index 385b804..665ba8d 100644
--- a/hw/xfree86/x86emu/x86emu/debug.h
+++ b/hw/xfree86/x86emu/x86emu/debug.h
@@ -108,7 +108,7 @@
 
 /*
  * The following allow us to look at the bytes of an instruction.  The
- * first INCR_INSTRN_LEN, is called everytime bytes are consumed in
+ * first INCR_INSTRN_LEN, is called every time bytes are consumed in
  * the decoding process.  The SAVE_IP_CS is called initially when the
  * major opcode of the instruction is accessed.
  */
-- 
2.8.0



More information about the xorg-devel mailing list