diff options
| author | olegos2 <74909582+olegos2@users.noreply.github.com> | 2024-12-28 21:06:51 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 17:06:51 +0100 |
| commit | bb0a445a6b57091fe5b878b09668d25edcb1e7ee (patch) | |
| tree | a53672a36d16e92250ee6b004f4d542e0b92958b /src | |
| parent | 7157803c03560d9835b9eea72e4991a64458e44a (diff) | |
| download | box64-bb0a445a6b57091fe5b878b09668d25edcb1e7ee.tar.gz box64-bb0a445a6b57091fe5b878b09668d25edcb1e7ee.zip | |
Spelling/typo fixes in code and documentation updates (#2223)
* Fix typo DLOpenned->DLOpened * Fix a typo in comments: versionned->versioned * Fix a typo in comment: cleanning->cleaning * Update COMPILE.md and USAGE.md * A few more typos in comments
Diffstat (limited to 'src')
| -rw-r--r-- | src/box64context.c | 2 | ||||
| -rw-r--r-- | src/core.c | 6 | ||||
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_helper.c | 4 | ||||
| -rw-r--r-- | src/dynarec/dynarec_private.h | 2 | ||||
| -rw-r--r-- | src/dynarec/la64/dynarec_la64_helper.c | 4 | ||||
| -rw-r--r-- | src/dynarec/rv64/dynarec_rv64_helper.c | 2 | ||||
| -rw-r--r-- | src/elfs/elfloader32.c | 2 | ||||
| -rw-r--r-- | src/include/box64context.h | 2 | ||||
| -rwxr-xr-x | src/libtools/threads32.c | 6 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibdl.c | 8 | ||||
| -rwxr-xr-x | src/wrapped32/wrappedlibc.c | 2 | ||||
| -rwxr-xr-x | src/wrapped32/wrappedlibdl.c | 4 |
12 files changed, 22 insertions, 22 deletions
diff --git a/src/box64context.c b/src/box64context.c index d88d8530..94df1142 100644 --- a/src/box64context.c +++ b/src/box64context.c @@ -303,7 +303,7 @@ void FreeBox64Context(box64context_t** context) if(--(*context)->forked >= 0) return; - box64context_t* ctx = *context; // local copy to do the cleanning + box64context_t* ctx = *context; // local copy to do the cleaning //clean_current_emuthread(); // cleaning main thread seems a bad idea if(ctx->local_maplib) diff --git a/src/core.c b/src/core.c index 655f9d96..cf7c7893 100644 --- a/src/core.c +++ b/src/core.c @@ -609,7 +609,7 @@ void computeRDTSC() uint64_t freq = ReadTSCFrequency(NULL); if(freq<((box64_rdtsc_1ghz)?1000000000LL:1000000)) { box64_rdtsc = 1; - if(hardware) printf_log(LOG_INFO, "Hardware counter to slow (%d kHz), not using it\n", freq/1000); + if(hardware) printf_log(LOG_INFO, "Hardware counter is too slow (%d kHz), not using it\n", freq/1000); hardware = 0; freq = ReadTSCFrequency(NULL); } @@ -1808,8 +1808,8 @@ void endBox64() printf_log(LOG_DEBUG, "Calling atexit registered functions (exiting box64)\n"); CallAllCleanup(emu); printf_log(LOG_DEBUG, "Calling fini for all loaded elfs and unload native libs\n"); - //void closeAllDLOpenned(); - //closeAllDLOpenned(); // close residual dlopenned libs. Disabled, seems like a bad idea, better to unload with proper dependancies + //void closeAllDLOpened(); + //closeAllDLOpened(); // close residual dlopened libs. Disabled, seems like a bad idea, better to unload with proper dependancies RunElfFini(my_context->elfs[0], emu); // unload needed libs needed_libs_t* needed = my_context->elfs[0]->needed; diff --git a/src/dynarec/arm64/dynarec_arm64_helper.c b/src/dynarec/arm64/dynarec_arm64_helper.c index 3833644e..2a51678e 100644 --- a/src/dynarec/arm64/dynarec_arm64_helper.c +++ b/src/dynarec/arm64/dynarec_arm64_helper.c @@ -2217,7 +2217,7 @@ static void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int neoncache_t cache = dyn->n; int s1_val = 0; int s2_val = 0; - // unload every uneeded cache + // unload every unneeded cache // ymm0 first int s3_top = 1; uint16_t to_purge = dyn->ymm_zero&~dyn->insts[i2].ymm0_in; @@ -2233,7 +2233,7 @@ static void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int } } s3_top = 0xffff; - // check SSE first, than MMX, in order, to optimise successive memory write + // check SSE first, than MMX, in order, to optimize successive memory write for(int i=0; i<16; ++i) { int j=findCacheSlot(dyn, ninst, NEON_CACHE_XMMW, i, &cache); if(j>=0 && findCacheSlot(dyn, ninst, NEON_CACHE_XMMW, i, &cache_i2)==-1) diff --git a/src/dynarec/dynarec_private.h b/src/dynarec/dynarec_private.h index 20a22f7c..09ba152d 100644 --- a/src/dynarec/dynarec_private.h +++ b/src/dynarec/dynarec_private.h @@ -39,7 +39,7 @@ typedef struct instruction_x64_s { int jmp_insts; // instuction to jump to (-1 if out of the block) uint8_t jmp_cond:1; // 1 of conditionnal jump uint8_t has_next:1; // does this opcode can continue to the next? - uint8_t has_callret:1; // this instruction have an optimised call setup + uint8_t has_callret:1; // this instruction have an optimized call setup uint8_t alive:1; // this opcode gets executed (0 if dead code in that block) uint8_t barrier; // next instruction is a jump point, so no optim allowed uint8_t state_flags;// One of SF_XXX state diff --git a/src/dynarec/la64/dynarec_la64_helper.c b/src/dynarec/la64/dynarec_la64_helper.c index b6448035..3e622517 100644 --- a/src/dynarec/la64/dynarec_la64_helper.c +++ b/src/dynarec/la64/dynarec_la64_helper.c @@ -1256,8 +1256,8 @@ static void fpuCacheTransform(dynarec_la64_t* dyn, int ninst, int s1, int s2, in lsxcache_t cache = dyn->lsx; int s1_val = 0; int s2_val = 0; - // unload every uneeded cache - // check SSE first, than MMX, in order, for optimisation issue + // unload every unneeded cache + // check SSE first, than MMX, in order, for optimization issue for (int i = 0; i < 16; ++i) { int j = findCacheSlot(dyn, ninst, LSX_CACHE_XMMW, i, &cache); if (j >= 0 && findCacheSlot(dyn, ninst, LSX_CACHE_XMMW, i, &cache_i2) == -1) diff --git a/src/dynarec/rv64/dynarec_rv64_helper.c b/src/dynarec/rv64/dynarec_rv64_helper.c index 8aa14e53..3b73d8b4 100644 --- a/src/dynarec/rv64/dynarec_rv64_helper.c +++ b/src/dynarec/rv64/dynarec_rv64_helper.c @@ -2620,7 +2620,7 @@ static void fpuCacheTransform(dynarec_rv64_t* dyn, int ninst, int s1, int s2, in int s1_val = 0; int s2_val = 0; // unload every unneeded cache - // check SSE first, than MMX, in order, for optimisation issue + // check SSE first, than MMX, in order, for optimization issue for (int i = 0; i < 16; ++i) { int j = findCacheSlot(dyn, ninst, EXT_CACHE_SS, i, &cache); if (j >= 0 && findCacheSlot(dyn, ninst, EXT_CACHE_SS, i, &cache_i2) == -1) diff --git a/src/elfs/elfloader32.c b/src/elfs/elfloader32.c index 53fc595e..2fbef7d5 100644 --- a/src/elfs/elfloader32.c +++ b/src/elfs/elfloader32.c @@ -407,7 +407,7 @@ static int FindR386COPYRel(elfheader_t* h, const char* name, ptr_t *offs, uint32 if((t==R_386_COPY) && symname && !strcmp(symname, name) && (sym->st_size==size)) { int version2 = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[ELF32_R_SYM(rel[i].r_info)]:-1; if(version2!=-1) version2 &= 0x7fff; - if(version && !version2) version2=-1; // match a versionned symbol against a global "local" symbol + if(version && !version2) version2=-1; // match a versioned symbol against a global "local" symbol const char* vername2 = GetSymbolVersion(h, version2); Elf32_Half flags = GetSymbolVersionFlag(h, version2); int veropt2 = flags?0:1; diff --git a/src/include/box64context.h b/src/include/box64context.h index 575348bf..6c14e219 100644 --- a/src/include/box64context.h +++ b/src/include/box64context.h @@ -138,7 +138,7 @@ typedef struct box64context_s { uintptr_t ep; // entry point lib_t *maplib; // lib and symbols handling - lib_t *local_maplib; // libs and symbols openned has local (only collection of libs, no symbols) + lib_t *local_maplib; // libs and symbols opened has local (only collection of libs, no symbols) dic_t *versym; // dictionnary of versioned symbols kh_mapsymbols_t *globdata; // GLOBAL_DAT relocation for COPY mapping in main elf kh_mapsymbols_t *uniques; // symbols with STB_GNU_UNIQUE bindings diff --git a/src/libtools/threads32.c b/src/libtools/threads32.c index ae406440..be7cf2f7 100755 --- a/src/libtools/threads32.c +++ b/src/libtools/threads32.c @@ -36,8 +36,8 @@ typedef void (*vFppp_t)(void*, void*, void*); typedef void (*vFpi_t)(void*, int); typedef int (*iFLi_t)(unsigned long, int); -//starting with glibc 2.34+, those 2 functions are in libc.so as versionned symbol only -// So use dlsym to get the symbol unversionned, as simple link will not work. +//starting with glibc 2.34+, those 2 functions are in libc.so as versioned symbol only +// So use dlsym to get the symbol unversioned, as simple link will not work. static vFppp_t real_pthread_cleanup_push_defer = NULL; static vFpi_t real_pthread_cleanup_pop_restore = NULL; // with glibc 2.34+, pthread_kill changed behaviour and might break some program, so using old version if possible @@ -447,7 +447,7 @@ EXPORT int my32___pthread_key_create(x64emu_t* emu, void* key, void* dtor) __att // phtread_cond_init with null attr seems to only write 1 (NULL) dword on x64, while it's 48 bytes on ARM. // Not sure why as sizeof(pthread_cond_init) is 48 on both platform... But Neverwinter Night init seems to rely on that // What about cond that are statically initialized? -// Note, this is is a versionned function (the pthread_cond_*), and this seems to correspond to an old behaviour +// Note, this is is a versioned function (the pthread_cond_*), and this seems to correspond to an old behaviour KHASH_MAP_INIT_INT(mapcond, pthread_cond_t*); diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c index d8b73b34..81ee1ff6 100644 --- a/src/wrapped/wrappedlibdl.c +++ b/src/wrapped/wrappedlibdl.c @@ -174,7 +174,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag) box_free(tmp); box_free(platform); } - // check if alread dlopenned... + // check if already dlopened... for (size_t i=MIN_NLIB; i<dl->lib_sz; ++i) { if(dl->dllibs[i].full && IsSameLib(dl->dllibs[i].lib, rfilename)) { if(flag&0x4) { // don't re-open in RTLD_NOLOAD mode @@ -254,7 +254,7 @@ void* my_dlopen(x64emu_t* emu, void *filename, int flag) my_context->deferredInitSz = old_deferredInitSz; my_context->deferredInitCap = old_deferredInitCap; } else { - // check if already dlopenned... + // check if already dlopened... for (size_t i=MIN_NLIB; i<dl->lib_sz; ++i) { if(dl->dllibs[i].is_self) { ++dl->dllibs[i].count; @@ -667,7 +667,7 @@ EXPORT int my__dl_find_object(x64emu_t* emu, void* addr, my_dl_find_object_t* re return -1; } -void closeAllDLOpenned() +void closeAllDLOpened() { dlprivate_t *dl = my_context->dlprivate; actualy_closing = 1; @@ -691,7 +691,7 @@ void closeAllDLOpenned() else #define CUSTOM_FINI \ - closeAllDLOpenned(); + closeAllDLOpened(); // define all standard library functions #include "wrappedlib_init.h" diff --git a/src/wrapped32/wrappedlibc.c b/src/wrapped32/wrappedlibc.c index 7ddf8545..464d5af7 100755 --- a/src/wrapped32/wrappedlibc.c +++ b/src/wrapped32/wrappedlibc.c @@ -931,7 +931,7 @@ EXPORT int my32___vsprintf_chk(x64emu_t* emu, void* buff, int flags, size_t len, return r; } -EXPORT int my32_vfscanf(x64emu_t* emu, void* stream, void* fmt, void* b) // probably uneeded to do a GOM, a simple wrap should enough +EXPORT int my32_vfscanf(x64emu_t* emu, void* stream, void* fmt, void* b) // probably unnecessary to do a GOM, a simple wrap should be enough { int n = myStackAlignScanf32((const char*)fmt, (uint32_t*)b, emu->scratch, N_SCRATCH); PREPARE_VALIST_32; diff --git a/src/wrapped32/wrappedlibdl.c b/src/wrapped32/wrappedlibdl.c index c3a79feb..6556f9a3 100755 --- a/src/wrapped32/wrappedlibdl.c +++ b/src/wrapped32/wrappedlibdl.c @@ -151,7 +151,7 @@ EXPORT int my32__dl_find_object(x64emu_t* emu, void* addr, my_dl_find_object_t* // if(!box32_isglibc234) setNeededLibs(lib, 1, "libc.so.6"); -void closeAllDLOpenned(); +void closeAllDLOpened(); #define PRE_INIT\ if(1) \ @@ -159,7 +159,7 @@ void closeAllDLOpenned(); else #define CUSTOM_FINI \ - closeAllDLOpenned(); + closeAllDLOpened(); // define all standard library functions #include "wrappedlib_init32.h" |