diff options
| author | rajdakin <rajdakin@gmail.com> | 2021-04-14 14:16:21 +0200 |
|---|---|---|
| committer | rajdakin <rajdakin@gmail.com> | 2021-04-14 14:25:02 +0200 |
| commit | cdf71c4cbc8c07510708cb7396cd1035300f587f (patch) | |
| tree | 8d790b143339b5b910594dd919754622b0885d40 /src/emu | |
| parent | e93a280d2c94476df79f586ed352cb68f3a28867 (diff) | |
| download | box64-cdf71c4cbc8c07510708cb7396cd1035300f587f.tar.gz box64-cdf71c4cbc8c07510708cb7396cd1035300f587f.zip | |
Oops-es
Diffstat (limited to 'src/emu')
| -rwxr-xr-x | src/emu/x64int3.c | 12 | ||||
| -rw-r--r-- | src/emu/x64run670f.c | 19 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/emu/x64int3.c b/src/emu/x64int3.c index 4c9ceb3d..36f7a7fa 100755 --- a/src/emu/x64int3.c +++ b/src/emu/x64int3.c @@ -92,7 +92,7 @@ void x64Int3(x64emu_t* emu) char *tmp; int post = 0; int perr = 0; - uint32_t *pu32 = NULL; + uint64_t *pu64 = NULL; const char *s = NULL; s = GetNativeName((void*)addr); if(addr==(uintptr_t)PltResolver) { @@ -160,19 +160,19 @@ void x64Int3(x64emu_t* emu) w(emu, addr); // some function never come back, so unlock the mutex first! pthread_mutex_lock(&emu->context->mutex_trace); if(post) - switch(post) { - case 1: snprintf(buff2, 63, " [%d sec %d nsec]", pu32?pu32[0]:~0u, pu32?pu32[1]:~0u); + switch(post) { // Only ever 2 for now... + case 1: snprintf(buff2, 63, " [%llu sec %llu nsec]", pu64?pu64[0]:~0ull, pu64?pu64[1]:~0ull); break; case 2: snprintf(buff2, 63, "(%s)", R_RAX?((char*)R_RAX):"nil"); break; - case 3: snprintf(buff2, 63, "(%s)", pu32?((char*)pu32):"nil"); + case 3: snprintf(buff2, 63, "(%s)", pu64?((char*)pu64):"nil"); break; case 4: snprintf(buff2, 63, " (%f)", ST0.d); break; case 5: { - uint32_t* p = (uint32_t*)R_RAX; + uint32_t* p = (uint32_t*)R_RAX; // uint64_t? (case never used) if(p) - snprintf(buff2, 63, " size=%dx%d, pitch=%d, pixels=%p", p[2], p[3], p[4], p+5); + snprintf(buff2, 63, " size=%ux%u, pitch=%u, pixels=%p", p[2], p[3], p[4], p+5); else snprintf(buff2, 63, "NULL Surface"); } diff --git a/src/emu/x64run670f.c b/src/emu/x64run670f.c index 749dfde8..1a504ac3 100644 --- a/src/emu/x64run670f.c +++ b/src/emu/x64run670f.c @@ -27,16 +27,17 @@ int Run670F(x64emu_t *emu, rex_t rex, int rep) { + (void)rep; uint8_t opcode; uint8_t nextop; - uint8_t tmp8u; - int8_t tmp8s; - int32_t tmp32s, tmp32s2; - uint32_t tmp32u, tmp32u2; - uint64_t tmp64u, tmp64u2; - reg64_t *oped, *opgd; - sse_regs_t *opex, *opgx, eax1; - mmx87_regs_t *opem, *opgm, eam1; + uint8_t tmp8u; (void)tmp8u; + int8_t tmp8s; (void)tmp8s; + int32_t tmp32s, tmp32s2; (void)tmp32s; (void)tmp32s2; + uint32_t tmp32u, tmp32u2; (void)tmp32u; (void)tmp32u2; + uint64_t tmp64u, tmp64u2; (void)tmp64u; (void)tmp64u2; + reg64_t *oped, *opgd; (void)oped; (void)opgd; + sse_regs_t *opex, *opgx, eax1; (void)eax1; + mmx87_regs_t *opem, *opgm, eam1; (void)opem; (void)opgm; (void)eam1; opcode = F8; @@ -65,4 +66,4 @@ int Run670F(x64emu_t *emu, rex_t rex, int rep) return 1; } return 0; -} \ No newline at end of file +} |