<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28208">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix typos<br><br>Change-Id: I6967a106ce1286d633ddeeb041f582e65f9ea78c<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M util/cbfstool/cbfs_image.c<br>M util/cbfstool/common.c<br>M util/cbfstool/common.h<br>M util/cbfstool/elfheaders.c<br>M util/cbfstool/elfparsing.h<br>M util/cbfstool/linux.h<br>M util/cbfstool/lz4/lib/lz4frame.c<br>M util/cbfstool/lz4/lib/xxhash.c<br>M util/cbfstool/lzma/C/LzmaEnc.h<br>M util/cbfstool/rmodule.h<br>M util/ifdtool/ifdtool.c<br>M util/ipqheader/mbn_tools.py<br>M util/kconfig/conf.c<br>M util/kconfig/confdata.c<br>M util/kconfig/gconf.c<br>M util/kconfig/kxgettext.c<br>M util/kconfig/lkc_proto.h<br>M util/kconfig/mconf.c<br>M util/kconfig/nconf.c<br>M util/kconfig/qconf.cc<br>M util/kconfig/symbol.c<br>M util/msrtool/intel_atom.c<br>M util/msrtool/intel_core2_later.c<br>M util/msrtool/intel_nehalem.c<br>M util/nvramtool/coreboot_tables.h<br>M util/romcc/romcc.c<br>M util/romcc/tests/linux_test2.c<br>M util/romcc/tests/raminit_test.c<br>M util/romcc/tests/raminit_test1.c<br>M util/romcc/tests/raminit_test2.c<br>M util/romcc/tests/simple_test30.c<br>M util/scripts/dts-to-fmd.sh<br>M util/superiotool/ite.c<br>33 files changed, 262 insertions(+), 262 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/28208/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c</span><br><span>index 4b6bda9..963c892 100644</span><br><span>--- a/util/cbfstool/cbfs_image.c</span><br><span>+++ b/util/cbfstool/cbfs_image.c</span><br><span>@@ -685,7 +685,7 @@</span><br><span> len = content_offset - addr - header_size;</span><br><span> memcpy(entry, header, header_size);</span><br><span> if (len != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* the header moved backwards a bit to accomodate cbfs_file</span><br><span style="color: hsl(120, 100%, 40%);">+ /* the header moved backwards a bit to accommodate cbfs_file</span><br><span> * alignment requirements, so patch up ->offset to still point</span><br><span> * to file data.</span><br><span> */</span><br><span>@@ -1867,9 +1867,9 @@</span><br><span> * If NULL, we have to create the first one. */</span><br><span> if (attr == NULL) {</span><br><span> /* New attributes start where the header ends.</span><br><span style="color: hsl(0, 100%, 40%);">- * header->offset is later set to accomodate the</span><br><span style="color: hsl(120, 100%, 40%);">+ * header->offset is later set to accommodate the</span><br><span> * additional structure.</span><br><span style="color: hsl(0, 100%, 40%);">- * No endianess translation necessary here, because both</span><br><span style="color: hsl(120, 100%, 40%);">+ * No endianness translation necessary here, because both</span><br><span> * fields are encoded the same way. */</span><br><span> header->attributes_offset = header->offset;</span><br><span> attr = (struct cbfs_file_attribute *)</span><br><span>diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c</span><br><span>index 14ccaa9..c1725dc 100644</span><br><span>--- a/util/cbfstool/common.c</span><br><span>+++ b/util/cbfstool/common.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> /* Utilities */</span><br><span> int verbose = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Small, OS/libc independent runtime check for endianess */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Small, OS/libc independent runtime check for endianness */</span><br><span> int is_big_endian(void)</span><br><span> {</span><br><span> static const uint32_t inttest = 0x12345678;</span><br><span>diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h</span><br><span>index baefc1c..f152104 100644</span><br><span>--- a/util/cbfstool/common.h</span><br><span>+++ b/util/cbfstool/common.h</span><br><span>@@ -25,7 +25,7 @@</span><br><span> #include <commonlib/helpers.h></span><br><span> #include <console/console.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Endianess */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Endianness */</span><br><span> #include "swab.h"</span><br><span> </span><br><span> #define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000)</span><br><span>diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c</span><br><span>index 3622663..9d02c30 100644</span><br><span>--- a/util/cbfstool/elfheaders.c</span><br><span>+++ b/util/cbfstool/elfheaders.c</span><br><span>@@ -100,7 +100,7 @@</span><br><span> * accurate but it is actually good enough in practice. It allows the</span><br><span> * header transformation code to ignore the possibility of underrun.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * We also must accomodate different ELF files, and hence formats,</span><br><span style="color: hsl(120, 100%, 40%);">+ * We also must accommodate different ELF files, and hence formats,</span><br><span> * in the same cbfs invocation. We might load a 64-bit payload</span><br><span> * on a 32-bit machine; we might even have a mixed armv7/armv8</span><br><span> * SOC or even a system with an x86/ARM!</span><br><span>diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h</span><br><span>index 1c6bf5e..8b08c13 100644</span><br><span>--- a/util/cbfstool/elfparsing.h</span><br><span>+++ b/util/cbfstool/elfparsing.h</span><br><span>@@ -84,7 +84,7 @@</span><br><span> void elf_init_eheader(Elf64_Ehdr *ehdr, int machine, int nbits, int endian);</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * Initialize a new ELF writer. Deafult machine type, endianness, etc is</span><br><span style="color: hsl(120, 100%, 40%);">+ * Initialize a new ELF writer. Default machine type, endianness, etc is</span><br><span> * copied from the passed in Elf64_Ehdr. Returns NULL on failure, valid</span><br><span> * pointer on success.</span><br><span> */</span><br><span>diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h</span><br><span>index c2d9079..4bba6f0 100644</span><br><span>--- a/util/cbfstool/linux.h</span><br><span>+++ b/util/cbfstool/linux.h</span><br><span>@@ -91,7 +91,7 @@</span><br><span> u32 init_size; /* 0x260 */</span><br><span> } __packed;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Paramters passed to 32-bit part of Linux</span><br><span style="color: hsl(120, 100%, 40%);">+/* Parameters passed to 32-bit part of Linux</span><br><span> * This is another view of the structure above.. */</span><br><span> struct linux_params {</span><br><span> u8 orig_x; /* 0x00 */</span><br><span>diff --git a/util/cbfstool/lz4/lib/lz4frame.c b/util/cbfstool/lz4/lib/lz4frame.c</span><br><span>index f984b27..aef508d 100644</span><br><span>--- a/util/cbfstool/lz4/lib/lz4frame.c</span><br><span>+++ b/util/cbfstool/lz4/lib/lz4frame.c</span><br><span>@@ -184,7 +184,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* unoptimized version; solves endianess & alignment issues */</span><br><span style="color: hsl(120, 100%, 40%);">+/* unoptimized version; solves endianness & alignment issues */</span><br><span> static U32 LZ4F_readLE32 (const BYTE* srcPtr)</span><br><span> {</span><br><span> U32 value32 = srcPtr[0];</span><br><span>diff --git a/util/cbfstool/lz4/lib/xxhash.c b/util/cbfstool/lz4/lib/xxhash.c</span><br><span>index ed9f8ed..0f89626 100644</span><br><span>--- a/util/cbfstool/lz4/lib/xxhash.c</span><br><span>+++ b/util/cbfstool/lz4/lib/xxhash.c</span><br><span>@@ -65,7 +65,7 @@</span><br><span> /* #define XXH_ACCEPT_NULL_INPUT_POINTER 1 */</span><br><span> </span><br><span> /* XXH_FORCE_NATIVE_FORMAT :</span><br><span style="color: hsl(0, 100%, 40%);">- * By default, xxHash library provides endian-independant Hash values, based on little-endian convention.</span><br><span style="color: hsl(120, 100%, 40%);">+ * By default, xxHash library provides endian-independent Hash values, based on little-endian convention.</span><br><span> * Results are therefore identical for little-endian and big-endian CPU.</span><br><span> * This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format.</span><br><span> * Should endian-independance be of no importance for your application, you may set the #define below to 1,</span><br><span>@@ -219,7 +219,7 @@</span><br><span> /***************************************</span><br><span> * Architecture Macros</span><br><span> ***************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianess;</span><br><span style="color: hsl(120, 100%, 40%);">+typedef enum { XXH_bigEndian=0, XXH_littleEndian=1 } XXH_endianness;</span><br><span> </span><br><span> /* XXH_CPU_LITTLE_ENDIAN can be defined externally, for example one the compiler command line */</span><br><span> #ifndef XXH_CPU_LITTLE_ENDIAN</span><br><span>@@ -233,7 +233,7 @@</span><br><span> *****************************/</span><br><span> typedef enum { XXH_aligned, XXH_unaligned } XXH_alignment;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianess endian, XXH_alignment align)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U32 XXH_readLE32_align(const void* ptr, XXH_endianness endian, XXH_alignment align)</span><br><span> {</span><br><span> if (align==XXH_unaligned)</span><br><span> return endian==XXH_littleEndian ? XXH_read32(ptr) : XXH_swap32(XXH_read32(ptr));</span><br><span>@@ -241,12 +241,12 @@</span><br><span> return endian==XXH_littleEndian ? *(const U32*)ptr : XXH_swap32(*(const U32*)ptr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U32 XXH_readLE32(const void* ptr, XXH_endianness endian)</span><br><span> {</span><br><span> return XXH_readLE32_align(ptr, endian, XXH_unaligned);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianess endian, XXH_alignment align)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U64 XXH_readLE64_align(const void* ptr, XXH_endianness endian, XXH_alignment align)</span><br><span> {</span><br><span> if (align==XXH_unaligned)</span><br><span> return endian==XXH_littleEndian ? XXH_read64(ptr) : XXH_swap64(XXH_read64(ptr));</span><br><span>@@ -254,7 +254,7 @@</span><br><span> return endian==XXH_littleEndian ? *(const U64*)ptr : XXH_swap64(*(const U64*)ptr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U64 XXH_readLE64(const void* ptr, XXH_endianness endian)</span><br><span> {</span><br><span> return XXH_readLE64_align(ptr, endian, XXH_unaligned);</span><br><span> }</span><br><span>@@ -285,7 +285,7 @@</span><br><span> /*****************************</span><br><span> * Simple Hash Functions</span><br><span> *****************************/</span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianess endian, XXH_alignment align)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U32 XXH32_endian_align(const void* input, size_t len, U32 seed, XXH_endianness endian, XXH_alignment align)</span><br><span> {</span><br><span> const BYTE* p = (const BYTE*)input;</span><br><span> const BYTE* bEnd = p + len;</span><br><span>@@ -371,7 +371,7 @@</span><br><span> XXH32_update(&state, input, len);</span><br><span> return XXH32_digest(&state);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> # if !defined(XXH_USELESS_ALIGN_BRANCH)</span><br><span> if ((((size_t)input) & 3) == 0) /* Input is 4-bytes aligned, leverage the speed benefit */</span><br><span>@@ -390,7 +390,7 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianess endian, XXH_alignment align)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U64 XXH64_endian_align(const void* input, size_t len, U64 seed, XXH_endianness endian, XXH_alignment align)</span><br><span> {</span><br><span> const BYTE* p = (const BYTE*)input;</span><br><span> const BYTE* bEnd = p + len;</span><br><span>@@ -511,7 +511,7 @@</span><br><span> XXH64_update(&state, input, len);</span><br><span> return XXH64_digest(&state);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> # if !defined(XXH_USELESS_ALIGN_BRANCH)</span><br><span> if ((((size_t)input) & 7)==0) /* Input is aligned, let's leverage the speed advantage */</span><br><span>@@ -612,7 +612,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state_in, const void* input, size_t len, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE XXH_errorcode XXH32_update_endian (XXH32_state_t* state_in, const void* input, size_t len, XXH_endianness endian)</span><br><span> {</span><br><span> XXH_istate32_t* state = (XXH_istate32_t *) state_in;</span><br><span> const BYTE* p = (const BYTE*)input;</span><br><span>@@ -703,7 +703,7 @@</span><br><span> </span><br><span> XXH_errorcode XXH32_update (XXH32_state_t* state_in, const void* input, size_t len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)</span><br><span> return XXH32_update_endian(state_in, input, len, XXH_littleEndian);</span><br><span>@@ -713,7 +713,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U32 XXH32_digest_endian (const XXH32_state_t* state_in, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U32 XXH32_digest_endian (const XXH32_state_t* state_in, XXH_endianness endian)</span><br><span> {</span><br><span> const XXH_istate32_t* state = (const XXH_istate32_t*) state_in;</span><br><span> const BYTE * p = (const BYTE*)state->mem32;</span><br><span>@@ -757,7 +757,7 @@</span><br><span> </span><br><span> unsigned int XXH32_digest (const XXH32_state_t* state_in)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)</span><br><span> return XXH32_digest_endian(state_in, XXH_littleEndian);</span><br><span>@@ -766,7 +766,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE XXH_errorcode XXH64_update_endian (XXH64_state_t* state_in, const void* input, size_t len, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE XXH_errorcode XXH64_update_endian (XXH64_state_t* state_in, const void* input, size_t len, XXH_endianness endian)</span><br><span> {</span><br><span> XXH_istate64_t * state = (XXH_istate64_t *) state_in;</span><br><span> const BYTE* p = (const BYTE*)input;</span><br><span>@@ -857,7 +857,7 @@</span><br><span> </span><br><span> XXH_errorcode XXH64_update (XXH64_state_t* state_in, const void* input, size_t len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)</span><br><span> return XXH64_update_endian(state_in, input, len, XXH_littleEndian);</span><br><span>@@ -867,7 +867,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state_in, XXH_endianess endian)</span><br><span style="color: hsl(120, 100%, 40%);">+FORCE_INLINE U64 XXH64_digest_endian (const XXH64_state_t* state_in, XXH_endianness endian)</span><br><span> {</span><br><span> const XXH_istate64_t * state = (const XXH_istate64_t *) state_in;</span><br><span> const BYTE * p = (const BYTE*)state->mem64;</span><br><span>@@ -951,7 +951,7 @@</span><br><span> </span><br><span> unsigned long long XXH64_digest (const XXH64_state_t* state_in)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- XXH_endianess endian_detected = (XXH_endianess)XXH_CPU_LITTLE_ENDIAN;</span><br><span style="color: hsl(120, 100%, 40%);">+ XXH_endianness endian_detected = (XXH_endianness)XXH_CPU_LITTLE_ENDIAN;</span><br><span> </span><br><span> if ((endian_detected==XXH_littleEndian) || XXH_FORCE_NATIVE_FORMAT)</span><br><span> return XXH64_digest_endian(state_in, XXH_littleEndian);</span><br><span>diff --git a/util/cbfstool/lzma/C/LzmaEnc.h b/util/cbfstool/lzma/C/LzmaEnc.h</span><br><span>index e62bdb3..c57c320 100644</span><br><span>--- a/util/cbfstool/lzma/C/LzmaEnc.h</span><br><span>+++ b/util/cbfstool/lzma/C/LzmaEnc.h</span><br><span>@@ -37,7 +37,7 @@</span><br><span> Returns:</span><br><span> SZ_OK - OK</span><br><span> SZ_ERROR_MEM - Memory allocation error</span><br><span style="color: hsl(0, 100%, 40%);">- SZ_ERROR_PARAM - Incorrect paramater in props</span><br><span style="color: hsl(120, 100%, 40%);">+ SZ_ERROR_PARAM - Incorrect parameter in props</span><br><span> SZ_ERROR_WRITE - Write callback error.</span><br><span> SZ_ERROR_PROGRESS - some break from progress callback</span><br><span> SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)</span><br><span>@@ -60,7 +60,7 @@</span><br><span> Return code:</span><br><span> SZ_OK - OK</span><br><span> SZ_ERROR_MEM - Memory allocation error</span><br><span style="color: hsl(0, 100%, 40%);">- SZ_ERROR_PARAM - Incorrect paramater</span><br><span style="color: hsl(120, 100%, 40%);">+ SZ_ERROR_PARAM - Incorrect parameter</span><br><span> SZ_ERROR_OUTPUT_EOF - output buffer overflow</span><br><span> SZ_ERROR_THREAD - errors in multithreading functions (only for Mt version)</span><br><span> */</span><br><span>diff --git a/util/cbfstool/rmodule.h b/util/cbfstool/rmodule.h</span><br><span>index 4385100..192928a 100644</span><br><span>--- a/util/cbfstool/rmodule.h</span><br><span>+++ b/util/cbfstool/rmodule.h</span><br><span>@@ -36,7 +36,7 @@</span><br><span> /* endian conversion ops */</span><br><span> struct xdr *xdr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Parsed ELF sturcture. */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Parsed ELF structure. */</span><br><span> struct parsed_elf pelf;</span><br><span> /* Program segment. */</span><br><span> Elf64_Phdr *phdr;</span><br><span>diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c</span><br><span>index eb5dbc3..671c7d5 100644</span><br><span>--- a/util/ifdtool/ifdtool.c</span><br><span>+++ b/util/ifdtool/ifdtool.c</span><br><span>@@ -1144,7 +1144,7 @@</span><br><span> * Determine if two memory regions overlap.</span><br><span> *</span><br><span> * @param r1, r2 Memory regions to compare.</span><br><span style="color: hsl(0, 100%, 40%);">- * @return 0 if the two regions are seperate</span><br><span style="color: hsl(120, 100%, 40%);">+ * @return 0 if the two regions are separate</span><br><span> * @return 1 if the two regions overlap</span><br><span> */</span><br><span> static int regions_collide(const region_t *r1, const region_t *r2)</span><br><span>diff --git a/util/ipqheader/mbn_tools.py b/util/ipqheader/mbn_tools.py</span><br><span>index bc2cdd2..c4d26c1 100755</span><br><span>--- a/util/ipqheader/mbn_tools.py</span><br><span>+++ b/util/ipqheader/mbn_tools.py</span><br><span>@@ -1165,7 +1165,7 @@</span><br><span> bytes_to_pad = ELF_BLOCK_ALIGN - pad_hash_segment</span><br><span> hash_seg_end = hash_tbl_end_addr + bytes_to_pad</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- # Check if a shifting is required to accomodate for the hash segment.</span><br><span style="color: hsl(120, 100%, 40%);">+ # Check if a shifting is required to accommodate for the hash segment.</span><br><span> # Get the minimum offset by going through the program headers.</span><br><span> # Note that the program headers in the input file do not contain</span><br><span> # the dummy program header for ELF + Program header, and the</span><br><span>diff --git a/util/kconfig/conf.c b/util/kconfig/conf.c</span><br><span>index 7aae1c7..1e704a6 100644</span><br><span>--- a/util/kconfig/conf.c</span><br><span>+++ b/util/kconfig/conf.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> line[0] = '\n';</span><br><span> line[1] = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sym_is_changeable(sym)) {</span><br><span> printf("%s\n", def);</span><br><span> line[0] = '\n';</span><br><span> line[1] = 0;</span><br><span>@@ -242,7 +242,7 @@</span><br><span> </span><br><span> sym = menu->sym;</span><br><span> is_new = !sym_has_value(sym);</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym)) {</span><br><span> conf_sym(menu);</span><br><span> sym_calc_value(sym);</span><br><span> switch (sym_get_tristate_value(sym)) {</span><br><span>@@ -429,7 +429,7 @@</span><br><span> </span><br><span> sym = menu->sym;</span><br><span> if (sym && !sym_has_value(sym)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym) ||</span><br><span> (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {</span><br><span> if (input_mode == listnewconfig) {</span><br><span> if (sym->name && !sym_is_choice_value(sym)) {</span><br><span>diff --git a/util/kconfig/confdata.c b/util/kconfig/confdata.c</span><br><span>index fc4a07a..a9051fa 100644</span><br><span>--- a/util/kconfig/confdata.c</span><br><span>+++ b/util/kconfig/confdata.c</span><br><span>@@ -718,7 +718,7 @@</span><br><span> goto next_menu;</span><br><span> sym->flags &= ~SYMBOL_WRITE;</span><br><span> /* If we cannot change the symbol - skip */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!sym_is_changable(sym))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sym_is_changeable(sym))</span><br><span> goto next_menu;</span><br><span> /* If symbol equals to default value - skip */</span><br><span> if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)</span><br><span>diff --git a/util/kconfig/gconf.c b/util/kconfig/gconf.c</span><br><span>index faa1c59..f0291c4 100644</span><br><span>--- a/util/kconfig/gconf.c</span><br><span>+++ b/util/kconfig/gconf.c</span><br><span>@@ -40,7 +40,7 @@</span><br><span> static gboolean show_name = TRUE;</span><br><span> static gboolean show_range = TRUE;</span><br><span> static gboolean show_value = TRUE;</span><br><span style="color: hsl(0, 100%, 40%);">-static gboolean resizeable = FALSE;</span><br><span style="color: hsl(120, 100%, 40%);">+static gboolean resizable = FALSE;</span><br><span> static int opt_mode = OPT_NORMAL;</span><br><span> </span><br><span> GtkWidget *main_wnd = NULL;</span><br><span>@@ -375,7 +375,7 @@</span><br><span> column = gtk_tree_view_get_column(view, COL_VALUE);</span><br><span> gtk_tree_view_column_set_visible(column, show_value);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (resizeable) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (resizable) {</span><br><span> for (i = 0; i < COL_VALUE; i++) {</span><br><span> column = gtk_tree_view_get_column(view, i);</span><br><span> gtk_tree_view_column_set_resizable(column, TRUE);</span><br><span>diff --git a/util/kconfig/kxgettext.c b/util/kconfig/kxgettext.c</span><br><span>index 2858738..907eae8 100644</span><br><span>--- a/util/kconfig/kxgettext.c</span><br><span>+++ b/util/kconfig/kxgettext.c</span><br><span>@@ -117,7 +117,7 @@</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct message *mesage__find(const char *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct message *message__find(const char *msg)</span><br><span> {</span><br><span> struct message *m = message__list;</span><br><span> </span><br><span>@@ -152,7 +152,7 @@</span><br><span> int rc = 0;</span><br><span> char bf[16384];</span><br><span> char *escaped = escape(msg, bf, sizeof(bf));</span><br><span style="color: hsl(0, 100%, 40%);">- struct message *m = mesage__find(escaped);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct message *m = message__find(escaped);</span><br><span> </span><br><span> if (m != NULL)</span><br><span> rc = message__add_file_line(m, file, lineno);</span><br><span>diff --git a/util/kconfig/lkc_proto.h b/util/kconfig/lkc_proto.h</span><br><span>index ecdb965..a6e30c7 100644</span><br><span>--- a/util/kconfig/lkc_proto.h</span><br><span>+++ b/util/kconfig/lkc_proto.h</span><br><span>@@ -45,7 +45,7 @@</span><br><span> P(sym_string_valid,bool,(struct symbol *sym, const char *newval));</span><br><span> P(sym_string_within_range,bool,(struct symbol *sym, const char *str));</span><br><span> P(sym_set_string_value,bool,(struct symbol *sym, const char *newval));</span><br><span style="color: hsl(0, 100%, 40%);">-P(sym_is_changable,bool,(struct symbol *sym));</span><br><span style="color: hsl(120, 100%, 40%);">+P(sym_is_changeable,bool,(struct symbol *sym));</span><br><span> P(sym_get_choice_prop,struct property *,(struct symbol *sym));</span><br><span> P(sym_get_default_prop,struct property *,(struct symbol *sym));</span><br><span> P(sym_get_string_value,const char *,(struct symbol *sym));</span><br><span>diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c</span><br><span>index 7e5dc76..81eebba 100644</span><br><span>--- a/util/kconfig/mconf.c</span><br><span>+++ b/util/kconfig/mconf.c</span><br><span>@@ -539,7 +539,7 @@</span><br><span> }</span><br><span> </span><br><span> val = sym_get_tristate_value(sym);</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym)) {</span><br><span> switch (type) {</span><br><span> case S_BOOLEAN:</span><br><span> item_make("[%c]", val == no ? ' ' : '*');</span><br><span>@@ -590,7 +590,7 @@</span><br><span> } else {</span><br><span> switch (type) {</span><br><span> case S_BOOLEAN:</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym))</span><br><span> item_make("[%c]", val == no ? ' ' : '*');</span><br><span> else</span><br><span> item_make("-%c-", val == no ? ' ' : '*');</span><br><span>@@ -603,7 +603,7 @@</span><br><span> case mod: ch = 'M'; break;</span><br><span> default: ch = ' '; break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym)) {</span><br><span> if (sym->rev_dep.tri == mod)</span><br><span> item_make("{%c}", ch);</span><br><span> else</span><br><span>@@ -620,7 +620,7 @@</span><br><span> if (tmp < 0)</span><br><span> tmp = 0;</span><br><span> item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)),</span><br><span style="color: hsl(0, 100%, 40%);">- (sym_has_value(sym) || !sym_is_changable(sym)) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ (sym_has_value(sym) || !sym_is_changeable(sym)) ?</span><br><span> "" : _(" (NEW)"));</span><br><span> item_set_tag('s');</span><br><span> item_set_data(menu);</span><br><span>@@ -628,7 +628,7 @@</span><br><span> }</span><br><span> }</span><br><span> item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)),</span><br><span style="color: hsl(0, 100%, 40%);">- (sym_has_value(sym) || !sym_is_changable(sym)) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ (sym_has_value(sym) || !sym_is_changeable(sym)) ?</span><br><span> "" : _(" (NEW)"));</span><br><span> if (menu->prompt->type == P_MENU) {</span><br><span> item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");</span><br><span>diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c</span><br><span>index 905dcd1..35c397f 100644</span><br><span>--- a/util/kconfig/nconf.c</span><br><span>+++ b/util/kconfig/nconf.c</span><br><span>@@ -814,7 +814,7 @@</span><br><span> }</span><br><span> </span><br><span> val = sym_get_tristate_value(sym);</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym)) {</span><br><span> switch (type) {</span><br><span> case S_BOOLEAN:</span><br><span> item_make(menu, 't', "[%c]",</span><br><span>@@ -868,7 +868,7 @@</span><br><span> } else {</span><br><span> switch (type) {</span><br><span> case S_BOOLEAN:</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym))</span><br><span> item_make(menu, 't', "[%c]",</span><br><span> val == no ? ' ' : '*');</span><br><span> else</span><br><span>@@ -887,7 +887,7 @@</span><br><span> ch = ' ';</span><br><span> break;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (sym_is_changable(sym)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sym_is_changeable(sym)) {</span><br><span> if (sym->rev_dep.tri == mod)</span><br><span> item_make(menu,</span><br><span> 't', "{%c}", ch);</span><br><span>@@ -907,14 +907,14 @@</span><br><span> item_add_str("%*c%s%s", tmp, ' ',</span><br><span> _(menu_get_prompt(menu)),</span><br><span> (sym_has_value(sym) ||</span><br><span style="color: hsl(0, 100%, 40%);">- !sym_is_changable(sym)) ? "" :</span><br><span style="color: hsl(120, 100%, 40%);">+ !sym_is_changeable(sym)) ? "" :</span><br><span> _(" (NEW)"));</span><br><span> goto conf_childs;</span><br><span> }</span><br><span> }</span><br><span> item_add_str("%*c%s%s", indent + 1, ' ',</span><br><span> _(menu_get_prompt(menu)),</span><br><span style="color: hsl(0, 100%, 40%);">- (sym_has_value(sym) || !sym_is_changable(sym)) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ (sym_has_value(sym) || !sym_is_changeable(sym)) ?</span><br><span> "" : _(" (NEW)"));</span><br><span> if (menu->prompt && menu->prompt->type == P_MENU) {</span><br><span> item_add_str(" %s", menu_is_empty(menu) ? "----" : "--->");</span><br><span>diff --git a/util/kconfig/qconf.cc b/util/kconfig/qconf.cc</span><br><span>index e787117..972326c 100644</span><br><span>--- a/util/kconfig/qconf.cc</span><br><span>+++ b/util/kconfig/qconf.cc</span><br><span>@@ -155,7 +155,7 @@</span><br><span> case S_TRISTATE:</span><br><span> char ch;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!sym_is_changable(sym) && list->optMode == normalOpt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sym_is_changeable(sym) && list->optMode == normalOpt) {</span><br><span> setPixmap(promptColIdx, QIcon());</span><br><span> setText(noColIdx, QString::null);</span><br><span> setText(modColIdx, QString::null);</span><br><span>diff --git a/util/kconfig/symbol.c b/util/kconfig/symbol.c</span><br><span>index af49439..b969616 100644</span><br><span>--- a/util/kconfig/symbol.c</span><br><span>+++ b/util/kconfig/symbol.c</span><br><span>@@ -792,7 +792,7 @@</span><br><span> return (const char *)sym->curr.val;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool sym_is_changable(struct symbol *sym)</span><br><span style="color: hsl(120, 100%, 40%);">+bool sym_is_changeable(struct symbol *sym)</span><br><span> {</span><br><span> return sym->visible > sym->rev_dep.tri;</span><br><span> }</span><br><span>diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c</span><br><span>index f2df5ae..489e0a0 100644</span><br><span>--- a/util/msrtool/intel_atom.c</span><br><span>+++ b/util/msrtool/intel_atom.c</span><br><span>@@ -278,7 +278,7 @@</span><br><span> }},</span><br><span> { 1, 1, "VMX inside of SMX operation", "R/WL", PRESENT_BIN, {</span><br><span> /* This bit enables a system executive to use</span><br><span style="color: hsl(0, 100%, 40%);">- * VMX in conjuction with SMX to support Intel</span><br><span style="color: hsl(120, 100%, 40%);">+ * VMX in conjunction with SMX to support Intel</span><br><span> * Trusted Execution Technology.</span><br><span> */</span><br><span> { MSR1(0), "VMX inside of SMX operation disabled" },</span><br><span>@@ -797,9 +797,9 @@</span><br><span> /* if CPUID.0AH EAX[7:0] > 2 */</span><br><span> { 10, 1, "AnyThread 2", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 9, 1, "EN2_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -820,9 +820,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 6, 1, "AnyThread 1", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 5, 1, "EN1_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -843,9 +843,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 2, 1, "AnyThread 0", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 1, 1, "EN0_Usr", "R/W", PRESENT_BIN, {</span><br><span>diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c</span><br><span>index 4bb0097..95e8e91 100644</span><br><span>--- a/util/msrtool/intel_core2_later.c</span><br><span>+++ b/util/msrtool/intel_core2_later.c</span><br><span>@@ -232,7 +232,7 @@</span><br><span> }},</span><br><span> { 1, 1, "VMX inside of SMX operation", "R/WL", PRESENT_BIN, {</span><br><span> /* This bit enables a system executive to use</span><br><span style="color: hsl(0, 100%, 40%);">- * VMX in conjuction with SMX to support Intel</span><br><span style="color: hsl(120, 100%, 40%);">+ * VMX in conjunction with SMX to support Intel</span><br><span> * Trusted Execution Technology.</span><br><span> */</span><br><span> { MSR1(0), "VMX inside of SMX operation disabled" },</span><br><span>@@ -821,9 +821,9 @@</span><br><span> /* if CPUID.0AH EAX[7:0] > 2 */</span><br><span> { 10, 1, "AnyThread 2", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 9, 1, "EN2_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -844,9 +844,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 6, 1, "AnyThread 1", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 5, 1, "EN1_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -867,9 +867,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 2, 1, "AnyThread 0", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 1, 1, "EN0_Usr", "R/W", PRESENT_BIN, {</span><br><span>diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c</span><br><span>index 11acdd8..726ad0a 100644</span><br><span>--- a/util/msrtool/intel_nehalem.c</span><br><span>+++ b/util/msrtool/intel_nehalem.c</span><br><span>@@ -307,7 +307,7 @@</span><br><span> }},</span><br><span> { 1, 1, "VMX inside of SMX operation", "R/WL", PRESENT_BIN, {</span><br><span> /* This bit enables a system executive to use</span><br><span style="color: hsl(0, 100%, 40%);">- * VMX in conjuction with SMX to support Intel</span><br><span style="color: hsl(120, 100%, 40%);">+ * VMX in conjunction with SMX to support Intel</span><br><span> * Trusted Execution Technology.</span><br><span> */</span><br><span> { MSR1(0), "VMX inside of SMX operation disabled" },</span><br><span>@@ -1109,7 +1109,7 @@</span><br><span> /* Whole package bit */</span><br><span> { 1, 1, "C1E Enable", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Nothing" },</span><br><span style="color: hsl(0, 100%, 40%);">- { MSR1(1), "CPU switch to the Minimum Enhaced Intel \</span><br><span style="color: hsl(120, 100%, 40%);">+ { MSR1(1), "CPU switch to the Minimum Enhanced Intel \</span><br><span> SpeedStep Technology operating point when all \</span><br><span> execution cores enter MWAIT (C1)" },</span><br><span> { BITVAL_EOT }</span><br><span>@@ -1373,9 +1373,9 @@</span><br><span> /* if CPUID.0AH EAX[7:0] > 2 */</span><br><span> { 10, 1, "AnyThread 2", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 9, 1, "EN2_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -1396,9 +1396,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 6, 1, "AnyThread 1", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 5, 1, "EN1_Usr", "R/W", PRESENT_BIN, {</span><br><span>@@ -1419,9 +1419,9 @@</span><br><span> /* if CPUID.0AH: EAX[7:0] > 2 */</span><br><span> { 2, 1, "AnyThread 0", "R/W", PRESENT_BIN, {</span><br><span> { MSR1(0), "Counter only increments the associated event \</span><br><span style="color: hsl(0, 100%, 40%);">- conditions occuring in the logical processor which programmed the MSR" },</span><br><span style="color: hsl(120, 100%, 40%);">+ conditions occurring in the logical processor which programmed the MSR" },</span><br><span> { MSR1(1), "Counting the associated event conditions \</span><br><span style="color: hsl(0, 100%, 40%);">- occuring across all logical processors sharing a processor core" },</span><br><span style="color: hsl(120, 100%, 40%);">+ occurring across all logical processors sharing a processor core" },</span><br><span> { BITVAL_EOT }</span><br><span> }},</span><br><span> { 1, 1, "EN0_Usr", "R/W", PRESENT_BIN, {</span><br><span>diff --git a/util/nvramtool/coreboot_tables.h b/util/nvramtool/coreboot_tables.h</span><br><span>index 1bd1e53..361b626 100644</span><br><span>--- a/util/nvramtool/coreboot_tables.h</span><br><span>+++ b/util/nvramtool/coreboot_tables.h</span><br><span>@@ -15,7 +15,7 @@</span><br><span> /* The coreboot table information is for conveying information</span><br><span> * from the firmware to the loaded OS image. Primarily this</span><br><span> * is expected to be information that cannot be discovered by</span><br><span style="color: hsl(0, 100%, 40%);">- * other means, such as quering the hardware directly.</span><br><span style="color: hsl(120, 100%, 40%);">+ * other means, such as querying the hardware directly.</span><br><span> *</span><br><span> * All of the information should be Position Independent Data.</span><br><span> * That is it should be safe to relocated any of the information</span><br><span>@@ -85,10 +85,10 @@</span><br><span> uint32_t table_entries;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Every entry in the boot enviroment list will correspond to a boot</span><br><span style="color: hsl(120, 100%, 40%);">+/* Every entry in the boot environment list will correspond to a boot</span><br><span> * info record. Encoding both type and size. The type is obviously</span><br><span> * so you can tell what it is. The size allows you to skip that</span><br><span style="color: hsl(0, 100%, 40%);">- * boot enviroment record if you don't know what it easy. This allows</span><br><span style="color: hsl(120, 100%, 40%);">+ * boot environment record if you don't know what it easy. This allows</span><br><span> * forward compatibility with records not yet defined.</span><br><span> */</span><br><span> struct lb_record {</span><br><span>diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c</span><br><span>index ebea26f..307fcf8 100644</span><br><span>--- a/util/romcc/romcc.c</span><br><span>+++ b/util/romcc/romcc.c</span><br><span>@@ -446,14 +446,14 @@</span><br><span> </span><br><span> #define OP_UEXTRACT 34</span><br><span> /* OP_UEXTRACT extracts an unsigned bitfield from a pseudo register</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo register to extract from</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo register to extract from</span><br><span> * ->type holds the size of the bitfield.</span><br><span> * ->u.bitfield.size holds the size of the bitfield.</span><br><span> * ->u.bitfield.offset holds the offset to extract from</span><br><span> */</span><br><span> #define OP_SEXTRACT 35</span><br><span> /* OP_SEXTRACT extracts a signed bitfield from a pseudo register</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo register to extract from</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo register to extract from</span><br><span> * ->type holds the size of the bitfield.</span><br><span> * ->u.bitfield.size holds the size of the bitfield.</span><br><span> * ->u.bitfield.offset holds the offset to extract from</span><br><span>@@ -495,7 +495,7 @@</span><br><span> #define OP_WRITE 60</span><br><span> /* OP_WRITE moves one pseudo register to another.</span><br><span> * MISC(0) holds the destination pseudo register, which must be an OP_DECL.</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo to move.</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo to move.</span><br><span> */</span><br><span> </span><br><span> #define OP_READ 61</span><br><span>@@ -926,13 +926,13 @@</span><br><span> #define MAX_MISC 3</span><br><span> #define MAX_TARG 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct occurance {</span><br><span style="color: hsl(120, 100%, 40%);">+struct occurrence {</span><br><span> int count;</span><br><span> const char *filename;</span><br><span> const char *function;</span><br><span> int line;</span><br><span> int col;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *parent;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *parent;</span><br><span> };</span><br><span> struct bitfield {</span><br><span> ulong_t size : 8;</span><br><span>@@ -967,7 +967,7 @@</span><br><span> #define TRIPLE_FLAG_LOCAL (1 << 26)</span><br><span> </span><br><span> #define TRIPLE_FLAG_COPY TRIPLE_FLAG_VOLATILE</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence;</span><br><span> union {</span><br><span> ulong_t cval;</span><br><span> struct bitfield bitfield;</span><br><span>@@ -1081,7 +1081,7 @@</span><br><span> FILE *errout;</span><br><span> FILE *dbgout;</span><br><span> struct file_state *file;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *last_occurrence;</span><br><span> const char *function;</span><br><span> int token_base;</span><br><span> struct token token[6];</span><br><span>@@ -1765,9 +1765,9 @@</span><br><span> static void loc(FILE *fp, struct compile_state *state, struct triple *triple)</span><br><span> {</span><br><span> int col;</span><br><span style="color: hsl(0, 100%, 40%);">- if (triple && triple->occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *spot;</span><br><span style="color: hsl(0, 100%, 40%);">- for(spot = triple->occurance; spot; spot = spot->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (triple && triple->occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *spot;</span><br><span style="color: hsl(120, 100%, 40%);">+ for(spot = triple->occurrence; spot; spot = spot->parent) {</span><br><span> fprintf(fp, "%s:%d.%d: ",</span><br><span> spot->filename, spot->line, spot->col);</span><br><span> }</span><br><span>@@ -1944,30 +1944,30 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void put_occurance(struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+static void put_occurrence(struct occurrence *occurrence)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">- occurance->count -= 1;</span><br><span style="color: hsl(0, 100%, 40%);">- if (occurance->count <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (occurance->parent) {</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(occurance->parent);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+ occurrence->count -= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (occurrence->count <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (occurrence->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(occurrence->parent);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- xfree(occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ xfree(occurrence);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_occurance(struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_occurrence(struct occurrence *occurrence)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">- occurance->count += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+ occurrence->count += 1;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance *new_occurance(struct compile_state *state)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence *new_occurrence(struct compile_state *state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *result, *last;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *result, *last;</span><br><span> const char *filename;</span><br><span> const char *function;</span><br><span> int line, col;</span><br><span>@@ -1984,7 +1984,7 @@</span><br><span> if (state->function) {</span><br><span> function = state->function;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- last = state->last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ last = state->last_occurrence;</span><br><span> if (last &&</span><br><span> (last->col == col) &&</span><br><span> (last->line == line) &&</span><br><span>@@ -1992,28 +1992,28 @@</span><br><span> ((last->filename == filename) ||</span><br><span> (strcmp(last->filename, filename) == 0)))</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(last);</span><br><span> return last;</span><br><span> }</span><br><span> if (last) {</span><br><span style="color: hsl(0, 100%, 40%);">- state->last_occurance = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+ state->last_occurrence = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(last);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- result = xmalloc(sizeof(*result), "occurance");</span><br><span style="color: hsl(120, 100%, 40%);">+ result = xmalloc(sizeof(*result), "occurrence");</span><br><span> result->count = 2;</span><br><span> result->filename = filename;</span><br><span> result->function = function;</span><br><span> result->line = line;</span><br><span> result->col = col;</span><br><span> result->parent = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- state->last_occurance = result;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->last_occurrence = result;</span><br><span> return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance *inline_occurance(struct compile_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *base, struct occurance *top)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence *inline_occurrence(struct compile_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *base, struct occurrence *top)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *result, *last;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *result, *last;</span><br><span> if (top->parent) {</span><br><span> internal_error(state, 0, "inlining an already inlined function?");</span><br><span> }</span><br><span>@@ -2025,36 +2025,36 @@</span><br><span> (base->filename[0] == '\0')) {</span><br><span> base = 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* See if I can reuse the last occurance I had */</span><br><span style="color: hsl(0, 100%, 40%);">- last = state->last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* See if I can reuse the last occurrence I had */</span><br><span style="color: hsl(120, 100%, 40%);">+ last = state->last_occurrence;</span><br><span> if (last &&</span><br><span> (last->parent == base) &&</span><br><span> (last->col == top->col) &&</span><br><span> (last->line == top->line) &&</span><br><span> (last->function == top->function) &&</span><br><span> (last->filename == top->filename)) {</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(last);</span><br><span> return last;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* I can't reuse the last occurance so free it */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* I can't reuse the last occurrence so free it */</span><br><span> if (last) {</span><br><span style="color: hsl(0, 100%, 40%);">- state->last_occurance = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+ state->last_occurrence = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(last);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- /* Generate a new occurance structure */</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(base);</span><br><span style="color: hsl(0, 100%, 40%);">- result = xmalloc(sizeof(*result), "occurance");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Generate a new occurrence structure */</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(base);</span><br><span style="color: hsl(120, 100%, 40%);">+ result = xmalloc(sizeof(*result), "occurrence");</span><br><span> result->count = 2;</span><br><span> result->filename = top->filename;</span><br><span> result->function = top->function;</span><br><span> result->line = top->line;</span><br><span> result->col = top->col;</span><br><span> result->parent = base;</span><br><span style="color: hsl(0, 100%, 40%);">- state->last_occurance = result;</span><br><span style="color: hsl(120, 100%, 40%);">+ state->last_occurrence = result;</span><br><span> return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance dummy_occurance = {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence dummy_occurrence = {</span><br><span> .count = 2,</span><br><span> .filename = __FILE__,</span><br><span> .function = "",</span><br><span>@@ -2079,7 +2079,7 @@</span><br><span> .type = &unknown_type,</span><br><span> .id = -1, /* An invalid id */</span><br><span> .u = { .cval = 0, },</span><br><span style="color: hsl(0, 100%, 40%);">- .occurance = &dummy_occurance,</span><br><span style="color: hsl(120, 100%, 40%);">+ .occurrence = &dummy_occurrence,</span><br><span> .param = { [0] = 0, [1] = 0, },</span><br><span> };</span><br><span> </span><br><span>@@ -2088,13 +2088,13 @@</span><br><span> </span><br><span> static struct triple *alloc_triple(struct compile_state *state,</span><br><span> int op, struct type *type, int lhs_wanted, int rhs_wanted,</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence)</span><br><span> {</span><br><span> size_t size, extra_count, min_count;</span><br><span> int lhs, rhs, misc, targ;</span><br><span> struct triple *ret, dummy;</span><br><span> dummy.op = op;</span><br><span style="color: hsl(0, 100%, 40%);">- dummy.occurance = occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ dummy.occurrence = occurrence;</span><br><span> valid_op(state, op);</span><br><span> lhs = table_ops[op].lhs;</span><br><span> rhs = table_ops[op].rhs;</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span> ret->type = type;</span><br><span> ret->next = ret;</span><br><span> ret->prev = ret;</span><br><span style="color: hsl(0, 100%, 40%);">- ret->occurance = occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ ret->occurrence = occurrence;</span><br><span> /* A simple sanity check */</span><br><span> if ((ret->op != op) ||</span><br><span> (ret->lhs != lhs) ||</span><br><span>@@ -2156,7 +2156,7 @@</span><br><span> (ret->type != type) ||</span><br><span> (ret->next != ret) ||</span><br><span> (ret->prev != ret) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (ret->occurance != occurance)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ (ret->occurrence != occurrence)) {</span><br><span> internal_error(state, ret, "huh?");</span><br><span> }</span><br><span> return ret;</span><br><span>@@ -2169,9 +2169,9 @@</span><br><span> src_lhs = src->lhs;</span><br><span> src_rhs = src->rhs;</span><br><span> src_size = TRIPLE_SIZE(src);</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(src->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(src->occurrence);</span><br><span> dup = alloc_triple(state, src->op, src->type, src_lhs, src_rhs,</span><br><span style="color: hsl(0, 100%, 40%);">- src->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ src->occurrence);</span><br><span> memcpy(dup, src, sizeof(*src));</span><br><span> memcpy(dup->param, src->param, src_size * sizeof(src->param[0]));</span><br><span> return dup;</span><br><span>@@ -2190,19 +2190,19 @@</span><br><span> int op, struct type *type, int lhs, int rhs)</span><br><span> {</span><br><span> struct triple *ret;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(0, 100%, 40%);">- occurance = new_occurance(state);</span><br><span style="color: hsl(0, 100%, 40%);">- ret = alloc_triple(state, op, type, lhs, rhs, occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence;</span><br><span style="color: hsl(120, 100%, 40%);">+ occurrence = new_occurrence(state);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = alloc_triple(state, op, type, lhs, rhs, occurrence);</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span> static struct triple *build_triple(struct compile_state *state,</span><br><span> int op, struct type *type, struct triple *left, struct triple *right,</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence)</span><br><span> {</span><br><span> struct triple *ret;</span><br><span> size_t count;</span><br><span style="color: hsl(0, 100%, 40%);">- ret = alloc_triple(state, op, type, -1, -1, occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = alloc_triple(state, op, type, -1, -1, occurrence);</span><br><span> count = TRIPLE_SIZE(ret);</span><br><span> if (count > 0) {</span><br><span> ret->param[0] = left;</span><br><span>@@ -2314,8 +2314,8 @@</span><br><span> base = MISC(base, 0);</span><br><span> }</span><br><span> block = block_of_triple(state, base);</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(base->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- ret = build_triple(state, op, type, left, right, base->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(base->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = build_triple(state, op, type, left, right, base->occurrence);</span><br><span> generate_lhs_pieces(state, ret);</span><br><span> if (triple_stores_block(state, ret)) {</span><br><span> ret->u.block = block;</span><br><span>@@ -2352,8 +2352,8 @@</span><br><span> }</span><br><span> </span><br><span> block = block_of_triple(state, base);</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(base->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- ret = build_triple(state, op, type, left, right, base->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(base->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = build_triple(state, op, type, left, right, base->occurrence);</span><br><span> generate_lhs_pieces(state, ret);</span><br><span> if (triple_stores_block(state, ret)) {</span><br><span> ret->u.block = block;</span><br><span>@@ -2385,7 +2385,7 @@</span><br><span> {</span><br><span> struct type *piece_type;</span><br><span> struct triple *piece;</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> piece_type = reg_type(state, ins->type, index * REG_SIZEOF_REG);</span><br><span> </span><br><span> if ((piece_type->type & TYPE_MASK) == TYPE_BITFIELD) {</span><br><span>@@ -2400,7 +2400,7 @@</span><br><span> fprintf(fp, "\n");</span><br><span> }</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">- piece = alloc_triple(state, OP_PIECE, piece_type, -1, -1, ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ piece = alloc_triple(state, OP_PIECE, piece_type, -1, -1, ins->occurrence);</span><br><span> piece->u.cval = index;</span><br><span> LHS(ins, piece->u.cval) = piece;</span><br><span> MISC(piece, 0) = ins;</span><br><span>@@ -2447,7 +2447,7 @@</span><br><span> static void name_of(FILE *fp, struct type *type);</span><br><span> static void display_triple(FILE *fp, struct triple *ins)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *ptr;</span><br><span> const char *reg;</span><br><span> char pre, post, vol;</span><br><span> pre = post = vol = ' ';</span><br><span>@@ -2519,7 +2519,7 @@</span><br><span> fprintf(fp, " ]");</span><br><span> #endif</span><br><span> fprintf(fp, " @");</span><br><span style="color: hsl(0, 100%, 40%);">- for(ptr = ins->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for(ptr = ins->occurrence; ptr; ptr = ptr->parent) {</span><br><span> fprintf(fp, " %s,%s:%d.%d",</span><br><span> ptr->function,</span><br><span> ptr->filename,</span><br><span>@@ -2548,7 +2548,7 @@</span><br><span> orig_count * sizeof(orig->param[0])) != 0) ||</span><br><span> (memcmp(&orig->u, &new->u, sizeof(orig->u)) != 0))</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *ptr;</span><br><span> int i, min_count, indent;</span><br><span> fprintf(fp, "(%p %p)", new, orig);</span><br><span> if (orig->op == new->op) {</span><br><span>@@ -2602,7 +2602,7 @@</span><br><span> #endif</span><br><span> </span><br><span> fprintf(fp, " @");</span><br><span style="color: hsl(0, 100%, 40%);">- for(ptr = orig->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for(ptr = orig->occurrence; ptr; ptr = ptr->parent) {</span><br><span> fprintf(fp, " %s,%s:%d.%d",</span><br><span> ptr->function,</span><br><span> ptr->filename,</span><br><span>@@ -2980,7 +2980,7 @@</span><br><span> if (ptr->use) {</span><br><span> internal_error(state, ptr, "ptr->use != 0");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(ptr->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(ptr->occurrence);</span><br><span> memset(ptr, -1, size);</span><br><span> xfree(ptr);</span><br><span> }</span><br><span>@@ -5534,7 +5534,7 @@</span><br><span> break;</span><br><span> }</span><br><span> case TOK_EOL:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Ignore # without a follwing ident */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ignore # without a following ident */</span><br><span> break;</span><br><span> default:</span><br><span> {</span><br><span>@@ -8145,7 +8145,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void propogate_use(struct compile_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+static void propagate_use(struct compile_state *state,</span><br><span> struct triple *orig, struct triple *new)</span><br><span> {</span><br><span> struct triple_set *user, *next;</span><br><span>@@ -8158,7 +8158,7 @@</span><br><span> replace_use(state, orig, new, user->member);</span><br><span> }</span><br><span> if (orig->use) {</span><br><span style="color: hsl(0, 100%, 40%);">- internal_error(state, orig, "used after propogate_use");</span><br><span style="color: hsl(120, 100%, 40%);">+ internal_error(state, orig, "used after propagate_use");</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -8786,7 +8786,7 @@</span><br><span> tuple = tmp;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ins, tuple);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ins, tuple);</span><br><span> release_triple(state, ins);</span><br><span> </span><br><span> return next;</span><br><span>@@ -8805,18 +8805,18 @@</span><br><span> fprintf(fp, "\n");</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span> for(i = 0; i < tuple->lhs; i++) {</span><br><span> struct type *piece_type;</span><br><span> struct triple *unknown;</span><br><span> </span><br><span> piece_type = reg_type(state, ins->type, i * REG_SIZEOF_REG);</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> unknown = alloc_triple(state, OP_UNKNOWNVAL, piece_type, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> LHS(tuple, i) = unknown;</span><br><span> }</span><br><span> return decompose_with_tuple(state, ins, tuple);</span><br><span>@@ -8834,9 +8834,9 @@</span><br><span> if (lval->op == OP_PIECE) {</span><br><span> return ins->next;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, lval->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span> if ((tuple->lhs != lval->lhs) &&</span><br><span> (!triple_is_def(state, lval) || (tuple->lhs != 1)))</span><br><span>@@ -8858,9 +8858,9 @@</span><br><span> piece = RHS(bitref, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> read = alloc_triple(state, OP_READ, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> RHS(read, 0) = piece;</span><br><span> </span><br><span> if (bitref) {</span><br><span>@@ -8871,9 +8871,9 @@</span><br><span> } else {</span><br><span> op = OP_UEXTRACT;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> extract = alloc_triple(state, op, bitref->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> RHS(extract, 0) = read;</span><br><span> extract->u.bitfield.size = bitref->u.bitfield.size;</span><br><span> extract->u.bitfield.offset = bitref->u.bitfield.offset;</span><br><span>@@ -8894,9 +8894,9 @@</span><br><span> </span><br><span> lval = MISC(ins, 0);</span><br><span> val = RHS(ins, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span> if ((tuple->lhs != lval->lhs) &&</span><br><span> (!triple_is_def(state, lval) || tuple->lhs != 1))</span><br><span>@@ -8928,15 +8928,15 @@</span><br><span> piece = RHS(bitref, 0);</span><br><span> </span><br><span> /* Read the destination register */</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> read = alloc_triple(state, OP_READ, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> RHS(read, 0) = piece;</span><br><span> </span><br><span> /* Deposit the new bitfield value */</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> deposit = alloc_triple(state, OP_DEPOSIT, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> RHS(deposit, 0) = read;</span><br><span> RHS(deposit, 1) = pval;</span><br><span> deposit->u.bitfield.size = bitref->u.bitfield.size;</span><br><span>@@ -8946,9 +8946,9 @@</span><br><span> pval = deposit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(tuple->occurrence);</span><br><span> write = alloc_triple(state, OP_WRITE, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ tuple->occurrence);</span><br><span> MISC(write, 0) = piece;</span><br><span> RHS(write, 0) = pval;</span><br><span> LHS(tuple, i) = write;</span><br><span>@@ -8957,7 +8957,7 @@</span><br><span> }</span><br><span> </span><br><span> struct decompose_load_info {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence;</span><br><span> struct triple *lval;</span><br><span> struct triple *tuple;</span><br><span> };</span><br><span>@@ -8970,8 +8970,8 @@</span><br><span> if (reg_offset > info->tuple->lhs) {</span><br><span> internal_error(state, info->tuple, "lhs to small?");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(info->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- load = alloc_triple(state, OP_LOAD, type, -1, -1, info->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(info->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ load = alloc_triple(state, OP_LOAD, type, -1, -1, info->occurrence);</span><br><span> RHS(load, 0) = mk_addr_expr(state, info->lval, mem_offset);</span><br><span> LHS(info->tuple, reg_offset/REG_SIZEOF_REG) = load;</span><br><span> }</span><br><span>@@ -8985,11 +8985,11 @@</span><br><span> if (!is_compound_type(ins->type)) {</span><br><span> return ins->next;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- info.occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.occurrence = ins->occurrence;</span><br><span> info.lval = RHS(ins, 0);</span><br><span> info.tuple = tuple;</span><br><span> walk_type_fields(state, ins->type, 0, 0, decompose_load_cb, &info);</span><br><span>@@ -8999,7 +8999,7 @@</span><br><span> </span><br><span> </span><br><span> struct decompose_store_info {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence;</span><br><span> struct triple *lval;</span><br><span> struct triple *val;</span><br><span> struct triple *tuple;</span><br><span>@@ -9013,8 +9013,8 @@</span><br><span> if (reg_offset > info->tuple->lhs) {</span><br><span> internal_error(state, info->tuple, "lhs to small?");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(info->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- store = alloc_triple(state, OP_STORE, type, -1, -1, info->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(info->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ store = alloc_triple(state, OP_STORE, type, -1, -1, info->occurrence);</span><br><span> RHS(store, 0) = mk_addr_expr(state, info->lval, mem_offset);</span><br><span> RHS(store, 1) = LHS(info->val, reg_offset);</span><br><span> LHS(info->tuple, reg_offset/REG_SIZEOF_REG) = store;</span><br><span>@@ -9029,11 +9029,11 @@</span><br><span> if (!is_compound_type(ins->type)) {</span><br><span> return ins->next;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- info.occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.occurrence = ins->occurrence;</span><br><span> info.lval = RHS(ins, 0);</span><br><span> info.val = RHS(ins, 1);</span><br><span> info.tuple = tuple;</span><br><span>@@ -9063,9 +9063,9 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span> if (((ins->type->type & TYPE_MASK) == TYPE_BITFIELD) &&</span><br><span> (tuple->lhs != 1))</span><br><span>@@ -9092,9 +9092,9 @@</span><br><span> </span><br><span> /* Remember the offset of the bitfield */</span><br><span> if ((type->type & TYPE_MASK) == TYPE_BITFIELD) {</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> piece = build_triple(state, OP_BITREF, type, piece, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> piece->u.bitfield.size = size_of(state, type);</span><br><span> piece->u.bitfield.offset = reg_offset % REG_SIZEOF_REG;</span><br><span> }</span><br><span>@@ -9128,9 +9128,9 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span> tuple = alloc_triple(state, OP_TUPLE, type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence);</span><br><span> </span><br><span> for(i = 0; i < tuple->lhs; i++, idx++) {</span><br><span> struct triple *piece;</span><br><span>@@ -11907,8 +11907,8 @@</span><br><span> ident = eat(state, TOK_IDENT)->ident;</span><br><span> if (ident->sym_label && ident->sym_label->def) {</span><br><span> ins = ident->sym_label->def;</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(ins->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance = new_occurance(state);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(ins->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence = new_occurrence(state);</span><br><span> }</span><br><span> else {</span><br><span> ins = label(state);</span><br><span>@@ -12029,8 +12029,8 @@</span><br><span> dest = label(state);</span><br><span> </span><br><span> /* Blame the branch on the default statement */</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(dbranch->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- dbranch->occurance = new_occurance(state);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(dbranch->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ dbranch->occurrence = new_occurrence(state);</span><br><span> </span><br><span> /* Thread the pieces together */</span><br><span> TARG(dbranch, 0) = dest;</span><br><span>@@ -13329,7 +13329,7 @@</span><br><span> }</span><br><span> i++;</span><br><span> if (((param->type & TYPE_MASK) != TYPE_VOID) && !param->field_ident) {</span><br><span style="color: hsl(0, 100%, 40%);">- error(state, 0, "No identifier for paramter %d\n", i);</span><br><span style="color: hsl(120, 100%, 40%);">+ error(state, 0, "No identifier for parameter %d\n", i);</span><br><span> }</span><br><span> </span><br><span> /* Get a list of statements for this function. */</span><br><span>@@ -13694,7 +13694,7 @@</span><br><span> }</span><br><span> </span><br><span> struct triple *copy_func(struct compile_state *state, struct triple *ofunc,</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *base_occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *base_occurrence)</span><br><span> {</span><br><span> struct triple *nfunc;</span><br><span> struct triple *nfirst, *ofirst;</span><br><span>@@ -13715,16 +13715,16 @@</span><br><span> ofirst = old = RHS(ofunc, 0);</span><br><span> do {</span><br><span> struct triple *new;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *occurrence;</span><br><span> int old_lhs, old_rhs;</span><br><span> old_lhs = old->lhs;</span><br><span> old_rhs = old->rhs;</span><br><span style="color: hsl(0, 100%, 40%);">- occurance = inline_occurance(state, base_occurance, old->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ occurrence = inline_occurrence(state, base_occurrence, old->occurrence);</span><br><span> if (ofunc->u.cval && (old->op == OP_FCALL)) {</span><br><span> MISC(old, 0)->u.cval += 1;</span><br><span> }</span><br><span> new = alloc_triple(state, old->op, old->type, old_lhs, old_rhs,</span><br><span style="color: hsl(0, 100%, 40%);">- occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ occurrence);</span><br><span> if (!triple_stores_block(state, new)) {</span><br><span> memcpy(&new->u, &old->u, sizeof(new->u));</span><br><span> }</span><br><span>@@ -13803,7 +13803,7 @@</span><br><span> if (ofunc->op != OP_LIST) {</span><br><span> internal_error(state, 0, "improper function");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- nfunc = copy_func(state, ofunc, fcall->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ nfunc = copy_func(state, ofunc, fcall->occurrence);</span><br><span> /* Prepend the parameter reading into the new function list */</span><br><span> ptype = nfunc->type->right;</span><br><span> pvals = fcall->rhs;</span><br><span>@@ -13842,7 +13842,7 @@</span><br><span> /* Remove the read of the return address */</span><br><span> ins = RHS(nfunc, 0)->prev->prev;</span><br><span> if ((ins->op != OP_READ) || (RHS(ins, 0) != fretaddr(state, nfunc))) {</span><br><span style="color: hsl(0, 100%, 40%);">- internal_error(state, ins, "Not return addres read?");</span><br><span style="color: hsl(120, 100%, 40%);">+ internal_error(state, ins, "Not return address read?");</span><br><span> }</span><br><span> release_triple(state, ins);</span><br><span> /* Remove the return instruction */</span><br><span>@@ -13884,7 +13884,7 @@</span><br><span> /* Now the result reading code */</span><br><span> if (result) {</span><br><span> result = flatten(state, fcall, result);</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, fcall, result);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, fcall, result);</span><br><span> }</span><br><span> </span><br><span> /* Release the original fcall instruction */</span><br><span>@@ -13971,7 +13971,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Point everyone at the new variable */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, var, new_var);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, var, new_var);</span><br><span> </span><br><span> /* Release the original variable */</span><br><span> for(i = 0; i < var->lhs; i++) {</span><br><span>@@ -14156,7 +14156,7 @@</span><br><span> ins = ins->next;</span><br><span> } while(ins != first);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate some memory to temorary hold the id info */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allocate some memory to temporary hold the id info */</span><br><span> info = xcmalloc(sizeof(*info) * (count +1), "info");</span><br><span> </span><br><span> /* Mark the local function */</span><br><span>@@ -14434,7 +14434,7 @@</span><br><span> read_expr(state,</span><br><span> deref_index(state, fresult(state, func), 1)));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, fcall, result);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, fcall, result);</span><br><span> }</span><br><span> </span><br><span> /* Release the original fcall instruction */</span><br><span>@@ -15501,7 +15501,7 @@</span><br><span> return vertex;</span><br><span> }</span><br><span> vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Renumber the blocks in a convenient fashion */</span><br><span> block->vertex = vertex;</span><br><span> sd[vertex].block = block;</span><br><span> sd[vertex].sdom = &sd[vertex];</span><br><span>@@ -15524,7 +15524,7 @@</span><br><span> return vertex;</span><br><span> }</span><br><span> vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Renumber the blocks in a convenient fashion */</span><br><span> block->vertex = vertex;</span><br><span> sd[vertex].block = block;</span><br><span> sd[vertex].sdom = &sd[vertex];</span><br><span>@@ -15743,7 +15743,7 @@</span><br><span> */</span><br><span> /* Theorem 3:</span><br><span> * Let w != r and let u be a vertex for which sdom(u) is</span><br><span style="color: hsl(0, 100%, 40%);">- * minimum amoung vertices u satisfying sdom(w) -> u -> w.</span><br><span style="color: hsl(120, 100%, 40%);">+ * minimum among vertices u satisfying sdom(w) -> u -> w.</span><br><span> * Then sdom(u) <= sdom(w) and idom(u) = idom(w).</span><br><span> */</span><br><span> /* Lemma 5: Let vertices v,w satisfy v -> w.</span><br><span>@@ -15765,7 +15765,7 @@</span><br><span> */</span><br><span> /* Corollary 1:</span><br><span> * Let w != r and let u be a vertex for which sdom(u) is</span><br><span style="color: hsl(0, 100%, 40%);">- * minimum amoung vertices u satisfying sdom(w) -> u -> w.</span><br><span style="color: hsl(120, 100%, 40%);">+ * minimum among vertices u satisfying sdom(w) -> u -> w.</span><br><span> * Then:</span><br><span> * { sdom(w) if sdom(w) = sdom(u),</span><br><span> * idom(w) = {</span><br><span>@@ -15905,7 +15905,7 @@</span><br><span> {</span><br><span> struct block_set *user;</span><br><span> struct triple *ins;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *ptr, *ptr2;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *ptr, *ptr2;</span><br><span> const char *filename1, *filename2;</span><br><span> int equal_filenames;</span><br><span> int i;</span><br><span>@@ -15915,11 +15915,11 @@</span><br><span> fprintf(fp, "%3d: %p (%p - %p) @",</span><br><span> block->vertex, block, block->first, block->last);</span><br><span> ins = block->first;</span><br><span style="color: hsl(0, 100%, 40%);">- while(ins != block->last && (ins->occurance->line == 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while(ins != block->last && (ins->occurrence->line == 0)) {</span><br><span> ins = ins->next;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ptr = ins->occurance;</span><br><span style="color: hsl(0, 100%, 40%);">- ptr2 = block->last->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr = ins->occurrence;</span><br><span style="color: hsl(120, 100%, 40%);">+ ptr2 = block->last->occurrence;</span><br><span> filename1 = ptr->filename? ptr->filename : "";</span><br><span> filename2 = ptr2->filename? ptr2->filename : "";</span><br><span> equal_filenames = (strcmp(filename1, filename2) == 0);</span><br><span>@@ -16166,10 +16166,10 @@</span><br><span> /* Count how many edges flow into this block */</span><br><span> in_edges = front->users;</span><br><span> /* Insert a phi function for this variable */</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(var->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(var->occurrence);</span><br><span> phi = alloc_triple(</span><br><span> state, OP_PHI, var->type, -1, in_edges,</span><br><span style="color: hsl(0, 100%, 40%);">- var->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ var->occurrence);</span><br><span> phi->u.block = front;</span><br><span> MISC(phi, 0) = var;</span><br><span> use_triple(var, phi);</span><br><span>@@ -16285,7 +16285,7 @@</span><br><span> if (set->member == oldval) {</span><br><span> *ptr = set->next;</span><br><span> xfree(set);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Only free one occurance from the stack */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Only free one occurrence from the stack */</span><br><span> return;</span><br><span> }</span><br><span> else {</span><br><span>@@ -16389,7 +16389,7 @@</span><br><span> if ((val->op == OP_WRITE) || (val->op == OP_READ)) {</span><br><span> internal_error(state, val, "bad value in read");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ptr, val);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ptr, val);</span><br><span> release_triple(state, ptr);</span><br><span> continue;</span><br><span> }</span><br><span>@@ -16420,7 +16420,7 @@</span><br><span> RHS(ptr, 0) = tval;</span><br><span> use_triple(tval, ptr);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ptr, tval);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ptr, tval);</span><br><span> unuse_triple(var, ptr);</span><br><span> /* Push OP_WRITE ptr->right onto a stack of variable uses */</span><br><span> push_triple(stacks, var, tval);</span><br><span>@@ -16622,10 +16622,10 @@</span><br><span> for(j = 0; j < zrhs; j++) {</span><br><span> if(!slot[j]) {</span><br><span> struct triple *unknown;</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(phi->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(phi->occurrence);</span><br><span> unknown = flatten(state, state->global_pool,</span><br><span> alloc_triple(state, OP_UNKNOWNVAL,</span><br><span style="color: hsl(0, 100%, 40%);">- phi->type, 0, 0, phi->occurance));</span><br><span style="color: hsl(120, 100%, 40%);">+ phi->type, 0, 0, phi->occurrence));</span><br><span> slot[j] = unknown;</span><br><span> use_triple(unknown, phi);</span><br><span> transform_to_arch_instruction(state, unknown);</span><br><span>@@ -16765,7 +16765,7 @@</span><br><span> var = var->next; /* point at the var */</span><br><span> </span><br><span> /* Replaces use of phi with var */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, phi, var);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, phi, var);</span><br><span> </span><br><span> /* Count the readers */</span><br><span> readers = 0;</span><br><span>@@ -17268,9 +17268,9 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(val->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(val->occurrence);</span><br><span> move = build_triple(state, OP_COPY, val->type, val, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- val->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ val->occurrence);</span><br><span> move->u.block = eblock;</span><br><span> move->id |= TRIPLE_FLAG_PRE_SPLIT;</span><br><span> use_triple(val, move);</span><br><span>@@ -17400,7 +17400,7 @@</span><br><span> return vertex;</span><br><span> }</span><br><span> vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">- /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Renumber the blocks in a convenient fashion */</span><br><span> block->vertex = vertex;</span><br><span> blocks[vertex].block = block;</span><br><span> blocks[vertex].vertex = vertex;</span><br><span>@@ -18750,7 +18750,7 @@</span><br><span> lr1->color = color;</span><br><span> lr1->classes = classes;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Keep the graph in sync by transfering the edges from lr2 to lr1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep the graph in sync by transferring the edges from lr2 to lr1 */</span><br><span> transfer_live_edges(rstate, lr1, lr2);</span><br><span> </span><br><span> return lr1;</span><br><span>@@ -18835,7 +18835,7 @@</span><br><span> rstate->lrd[j].lr = &rstate->lr[0];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Initalize the live_range_def */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize the live_range_def */</span><br><span> rstate->lrd[j].next = &rstate->lrd[j];</span><br><span> rstate->lrd[j].prev = &rstate->lrd[j];</span><br><span> rstate->lrd[j].def = ins;</span><br><span>@@ -18847,7 +18847,7 @@</span><br><span> } while(ins != first);</span><br><span> rstate->ranges = i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Make a second pass to handle achitecture specific register</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make a second pass to handle architecture specific register</span><br><span> * constraints.</span><br><span> */</span><br><span> ins = first;</span><br><span>@@ -19541,7 +19541,7 @@</span><br><span> *</span><br><span> * So far I don't have a test case for this, the resolving</span><br><span> * of mandatory constraints has solved all of my</span><br><span style="color: hsl(0, 100%, 40%);">- * know issues. So I have choosen not to write any</span><br><span style="color: hsl(120, 100%, 40%);">+ * know issues. So I have chosen not to write any</span><br><span> * code until I cat get a better feel for cases where</span><br><span> * it would be useful to have.</span><br><span> *</span><br><span>@@ -20749,7 +20749,7 @@</span><br><span> lnode->val = lnode->def;</span><br><span> }</span><br><span> /* Only allow lattice high when all of my inputs</span><br><span style="color: hsl(0, 100%, 40%);">- * are also lattice high. Occassionally I can</span><br><span style="color: hsl(120, 100%, 40%);">+ * are also lattice high. Occasionally I can</span><br><span> * have constants with a lattice low input, so</span><br><span> * I do not need to check that case.</span><br><span> */</span><br><span>@@ -20779,7 +20779,7 @@</span><br><span> !triple_is_cbranch(state, lnode->def)) ||</span><br><span> (lnode->def->op == OP_PIECE))) {</span><br><span> #if DEBUG_ROMCC_WARNINGS</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "FIXME constant propogate through expressions with multiple left hand sides"</span><br><span style="color: hsl(120, 100%, 40%);">+#warning "FIXME constant propagate through expressions with multiple left hand sides"</span><br><span> #endif</span><br><span> if (changed) {</span><br><span> internal_warning(state, lnode->def, "non def changes value?");</span><br><span>@@ -21471,17 +21471,17 @@</span><br><span> (unknown_triple.template_id != 0) ||</span><br><span> (unknown_triple.id != -1) ||</span><br><span> (unknown_triple.type != &unknown_type) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (unknown_triple.occurance != &dummy_occurance) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (unknown_triple.occurrence != &dummy_occurrence) ||</span><br><span> (unknown_triple.param[0] != 0) ||</span><br><span> (unknown_triple.param[1] != 0)) {</span><br><span> internal_error(state, &unknown_triple, "unknown_triple corrupted!");</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if ( (dummy_occurance.count != 2) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (strcmp(dummy_occurance.filename, __FILE__) != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (strcmp(dummy_occurance.function, "") != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (dummy_occurance.col != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (dummy_occurance.parent != 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- internal_error(state, &unknown_triple, "dummy_occurance corrupted!");</span><br><span style="color: hsl(120, 100%, 40%);">+ if ( (dummy_occurrence.count != 2) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (strcmp(dummy_occurrence.filename, __FILE__) != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (strcmp(dummy_occurrence.function, "") != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (dummy_occurrence.col != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (dummy_occurrence.parent != 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ internal_error(state, &unknown_triple, "dummy_occurrence corrupted!");</span><br><span> }</span><br><span> if ( (unknown_type.type != TYPE_UNKNOWN)) {</span><br><span> internal_error(state, &unknown_triple, "unknown_type corrupted!");</span><br><span>@@ -21604,7 +21604,7 @@</span><br><span> /* Do strength reduction and simple constant optimizations */</span><br><span> simplify_all(state);</span><br><span> verify_consistency(state);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Propogate constants throughout the code */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate constants throughout the code */</span><br><span> scc_transform(state);</span><br><span> verify_consistency(state);</span><br><span> #if DEBUG_ROMCC_WARNINGS</span><br><span>@@ -23181,7 +23181,7 @@</span><br><span> use_triple(LHS(div, 1), div);</span><br><span> </span><br><span> /* Replate uses of ins with the appropriate piece of the div */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ins, LHS(div, index));</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ins, LHS(div, index));</span><br><span> release_triple(state, ins);</span><br><span> </span><br><span> /* Return the address of the next instruction */</span><br><span>@@ -23258,7 +23258,7 @@</span><br><span> use_triple(val_mask, new);</span><br><span> </span><br><span> /* Move all of the users over to the new expression */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ins, new);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ins, new);</span><br><span> </span><br><span> /* Delete the original triple */</span><br><span> release_triple(state, ins);</span><br><span>@@ -23306,7 +23306,7 @@</span><br><span> use_triple(mask, val_mask);</span><br><span> </span><br><span> /* Move all of the users over to the new expression */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ins, val_mask);</span><br><span style="color: hsl(120, 100%, 40%);">+ propagate_use(state, ins, val_mask);</span><br><span> </span><br><span> /* Release the original instruction */</span><br><span> release_triple(state, ins);</span><br><span>@@ -24796,12 +24796,12 @@</span><br><span> {</span><br><span> struct triple *first, *ins;</span><br><span> int print_location;</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *last_occurrence;</span><br><span> FILE *fp;</span><br><span> int max_inline_depth;</span><br><span> max_inline_depth = 0;</span><br><span> print_location = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- last_occurance = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ last_occurrence = 0;</span><br><span> fp = state->output;</span><br><span> /* Masks for common sizes */</span><br><span> fprintf(fp, ".section \"" DATA_SECTION "\"\n");</span><br><span>@@ -24815,20 +24815,20 @@</span><br><span> ins = first;</span><br><span> do {</span><br><span> if (print_location &&</span><br><span style="color: hsl(0, 100%, 40%);">- last_occurance != ins->occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ins->occurance->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ last_occurrence != ins->occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ins->occurrence->parent) {</span><br><span> fprintf(fp, "\t/* %s,%s:%d.%d */\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance->function?ins->occurance->function:"(null)",</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance->filename?ins->occurance->filename:"(null)",</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance->line,</span><br><span style="color: hsl(0, 100%, 40%);">- ins->occurance->col);</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence->function?ins->occurrence->function:"(null)",</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence->filename?ins->occurrence->filename:"(null)",</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence->line,</span><br><span style="color: hsl(120, 100%, 40%);">+ ins->occurrence->col);</span><br><span> }</span><br><span> else {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *ptr;</span><br><span> int inline_depth;</span><br><span> fprintf(fp, "\t/*\n");</span><br><span> inline_depth = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- for(ptr = ins->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for(ptr = ins->occurrence; ptr; ptr = ptr->parent) {</span><br><span> inline_depth++;</span><br><span> fprintf(fp, "\t * %s,%s:%d.%d\n",</span><br><span> ptr->function,</span><br><span>@@ -24841,11 +24841,11 @@</span><br><span> max_inline_depth = inline_depth;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (last_occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(last_occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (last_occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(last_occurrence);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">- last_occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(ins->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+ last_occurrence = ins->occurrence;</span><br><span> }</span><br><span> </span><br><span> print_instruction(state, ins, fp);</span><br><span>diff --git a/util/romcc/tests/linux_test2.c b/util/romcc/tests/linux_test2.c</span><br><span>index 577e0c3..c4fbf0a 100644</span><br><span>--- a/util/romcc/tests/linux_test2.c</span><br><span>+++ b/util/romcc/tests/linux_test2.c</span><br><span>@@ -155,8 +155,8 @@</span><br><span> * 0 = No coherent HT configuration space restrictions</span><br><span> * 1 = Limit coherent HT configuration space based on node count</span><br><span> * [16:16] Local Interrupt Conversion Enable.</span><br><span style="color: hsl(0, 100%, 40%);">- * 0 = ExtInt/NMI interrups unaffected.</span><br><span style="color: hsl(0, 100%, 40%);">- * 1 = ExtInt/NMI broadcat interrupts converted to LINT0/1</span><br><span style="color: hsl(120, 100%, 40%);">+ * 0 = ExtInt/NMI interrupts unaffected.</span><br><span style="color: hsl(120, 100%, 40%);">+ * 1 = ExtInt/NMI broadcast interrupts converted to LINT0/1</span><br><span> * [17:17] APIC Extended Broadcast Enable.</span><br><span> * 0 = APIC broadcast is 0F</span><br><span> * 1 = APIC broadcast is FF</span><br><span>@@ -484,7 +484,7 @@</span><br><span> * 0 = CPU writes may be posted</span><br><span> * 1 = CPU writes must be non-posted</span><br><span> * [31: 8] Memory-Mapped I/O Limit Address i (39-16)</span><br><span style="color: hsl(0, 100%, 40%);">- * This field defines the upp adddress bits of a 40-bit address that</span><br><span style="color: hsl(120, 100%, 40%);">+ * This field defines the upp address bits of a 40-bit address that</span><br><span> * defines the end of a memory-mapped I/O region n</span><br><span> */</span><br><span> PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,</span><br><span>diff --git a/util/romcc/tests/raminit_test.c b/util/romcc/tests/raminit_test.c</span><br><span>index b1baf7e..564786b 100644</span><br><span>--- a/util/romcc/tests/raminit_test.c</span><br><span>+++ b/util/romcc/tests/raminit_test.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span> /*</span><br><span> * Effects: Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">- * DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+ * DRAMC register, which records if ram is registered or not,</span><br><span> * and controls the refresh rate.</span><br><span> * The refresh rate is not set here, as memory refresh</span><br><span> * cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span> }</span><br><span> pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span> /* Now see if reg is 0xff. If it is we are done. If not,</span><br><span style="color: hsl(0, 100%, 40%);">- * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+ * we need to set 0x18 into register 0x50.l</span><br><span> * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span> * then or in 0x1 to 0x51.b</span><br><span> */</span><br><span>diff --git a/util/romcc/tests/raminit_test1.c b/util/romcc/tests/raminit_test1.c</span><br><span>index b1baf7e..564786b 100644</span><br><span>--- a/util/romcc/tests/raminit_test1.c</span><br><span>+++ b/util/romcc/tests/raminit_test1.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span> /*</span><br><span> * Effects: Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">- * DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+ * DRAMC register, which records if ram is registered or not,</span><br><span> * and controls the refresh rate.</span><br><span> * The refresh rate is not set here, as memory refresh</span><br><span> * cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span> }</span><br><span> pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span> /* Now see if reg is 0xff. If it is we are done. If not,</span><br><span style="color: hsl(0, 100%, 40%);">- * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+ * we need to set 0x18 into register 0x50.l</span><br><span> * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span> * then or in 0x1 to 0x51.b</span><br><span> */</span><br><span>diff --git a/util/romcc/tests/raminit_test2.c b/util/romcc/tests/raminit_test2.c</span><br><span>index c5b366f..af6eaae 100644</span><br><span>--- a/util/romcc/tests/raminit_test2.c</span><br><span>+++ b/util/romcc/tests/raminit_test2.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span> /*</span><br><span> * Effects: Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">- * DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+ * DRAMC register, which records if ram is registered or not,</span><br><span> * and controls the refresh rate.</span><br><span> * The refresh rate is not set here, as memory refresh</span><br><span> * cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span> }</span><br><span> pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span> /* Now see if reg is 0xff. If it is we are done. If not,</span><br><span style="color: hsl(0, 100%, 40%);">- * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+ * we need to set 0x18 into register 0x50.l</span><br><span> * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span> * then or in 0x1 to 0x51.b</span><br><span> */</span><br><span>diff --git a/util/romcc/tests/simple_test30.c b/util/romcc/tests/simple_test30.c</span><br><span>index ede2091..6130ca7 100644</span><br><span>--- a/util/romcc/tests/simple_test30.c</span><br><span>+++ b/util/romcc/tests/simple_test30.c</span><br><span>@@ -569,8 +569,8 @@</span><br><span> * 0 = No coherent HT configuration space restrictions</span><br><span> * 1 = Limit coherent HT configuration space based on node count</span><br><span> * [16:16] Local Interrupt Conversion Enable.</span><br><span style="color: hsl(0, 100%, 40%);">- * 0 = ExtInt/NMI interrups unaffected.</span><br><span style="color: hsl(0, 100%, 40%);">- * 1 = ExtInt/NMI broadcat interrupts converted to LINT0/1</span><br><span style="color: hsl(120, 100%, 40%);">+ * 0 = ExtInt/NMI interrupts unaffected.</span><br><span style="color: hsl(120, 100%, 40%);">+ * 1 = ExtInt/NMI broadcast interrupts converted to LINT0/1</span><br><span> * [17:17] APIC Extended Broadcast Enable.</span><br><span> * 0 = APIC broadcast is 0F</span><br><span> * 1 = APIC broadcast is FF</span><br><span>@@ -898,7 +898,7 @@</span><br><span> * 0 = CPU writes may be posted</span><br><span> * 1 = CPU writes must be non-posted</span><br><span> * [31: 8] Memory-Mapped I/O Limit Address i (39-16)</span><br><span style="color: hsl(0, 100%, 40%);">- * This field defines the upp adddress bits of a 40-bit address that</span><br><span style="color: hsl(120, 100%, 40%);">+ * This field defines the upp address bits of a 40-bit address that</span><br><span> * defines the end of a memory-mapped I/O region n</span><br><span> */</span><br><span> PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,</span><br><span>diff --git a/util/scripts/dts-to-fmd.sh b/util/scripts/dts-to-fmd.sh</span><br><span>index 5068a99..00e718be 100755</span><br><span>--- a/util/scripts/dts-to-fmd.sh</span><br><span>+++ b/util/scripts/dts-to-fmd.sh</span><br><span>@@ -103,7 +103,7 @@</span><br><span> fi</span><br><span> </span><br><span> # special handling: COREBOOT region at 0, inject a 128K bootblock</span><br><span style="color: hsl(0, 100%, 40%);">- # The size may need changes to accomodate the chipsets,</span><br><span style="color: hsl(120, 100%, 40%);">+ # The size may need changes to accommodate the chipsets,</span><br><span> # but should work for now.</span><br><span> if [ "${REGION_NAME}" = "COREBOOT" -a \</span><br><span> $(( ${REGION_START} )) -eq 0 ]; then</span><br><span>diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c</span><br><span>index 1eccb64..6fb4877 100644</span><br><span>--- a/util/superiotool/ite.c</span><br><span>+++ b/util/superiotool/ite.c</span><br><span>@@ -118,7 +118,7 @@</span><br><span> {NOLDN, "I/O Port Base Address for Descriptor 1 (IOBAD1)",</span><br><span> {0x62,0x63,EOT},</span><br><span> {NANA,NANA,EOT}},</span><br><span style="color: hsl(0, 100%, 40%);">- {NOLDN, "Interupt Request Number and Wake-Up on IRQ Enable (IRQNUMX)",</span><br><span style="color: hsl(120, 100%, 40%);">+ {NOLDN, "Interrupt Request Number and Wake-Up on IRQ Enable (IRQNUMX)",</span><br><span> {0x70,EOT},</span><br><span> {NANA,EOT}},</span><br><span> {NOLDN, "Interrupt Request Type Select (IRQTP)",</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28208">change 28208</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28208"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I6967a106ce1286d633ddeeb041f582e65f9ea78c </div>
<div style="display:none"> Gerrit-Change-Number: 28208 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>