claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warnings related to variable types

Browse Source
This commit is contained in:
Alexander Babikov
2022-04-14 07:00:06 +05:00
parent 042e3df65d
commit 4e82d93729
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/86box.c
View File

@@ -1169,7 +1169,7 @@ pc_close(thread_t *ptr)
#ifdef __APPLE__ #ifdef __APPLE__
static void _ui_window_title(void *s) static void _ui_window_title(void *s)
{ {
ui_window_title((const wchar_t *) s); ui_window_title((wchar_t *) s);
free(s); free(s);
} }
#endif #endif

4
src/codegen/codegen_ops_x86-64.h
View File

@@ -23,12 +23,12 @@ static inline int find_host_xmm_reg()
} }
static inline void call(codeblock_t *block, uintptr_t func) static inline void call(codeblock_t *block, uintptr_t func)
{ {
uintptr_t diff = func - (uintptr_t)&block->data[block_pos + 5]; intptr_t diff = (intptr_t)(func - (uintptr_t)&block->data[block_pos + 5]);
codegen_reg_loaded[0] = codegen_reg_loaded[1] = codegen_reg_loaded[2] = codegen_reg_loaded[3] = 0; codegen_reg_loaded[0] = codegen_reg_loaded[1] = codegen_reg_loaded[2] = codegen_reg_loaded[3] = 0;
codegen_reg_loaded[4] = codegen_reg_loaded[5] = codegen_reg_loaded[6] = codegen_reg_loaded[7] = 0; codegen_reg_loaded[4] = codegen_reg_loaded[5] = codegen_reg_loaded[6] = codegen_reg_loaded[7] = 0;
if (diff >= -0x80000000ULL && diff < 0x7fffffffULL) if (diff >= -0x80000000 && diff < 0x7fffffff)
{ {
addbyte(0xE8); /*CALL*/ addbyte(0xE8); /*CALL*/
addlong((uint32_t)diff); addlong((uint32_t)diff);

8
src/codegen_new/codegen_backend_x86-64_ops.c
View File

@@ -27,10 +27,10 @@
static inline void call(codeblock_t *block, uintptr_t func) static inline void call(codeblock_t *block, uintptr_t func)
{ {
uintptr_t diff; intptr_t diff;
codegen_alloc_bytes(block, 5); codegen_alloc_bytes(block, 5);
diff = func - (uintptr_t)&block_write_data[block_pos + 5]; diff = (intptr_t)(func - (uintptr_t)&block_write_data[block_pos + 5]);
if (diff >= -0x80000000 && diff < 0x7fffffff) if (diff >= -0x80000000 && diff < 0x7fffffff)
{ {
@@ -48,10 +48,10 @@ static inline void call(codeblock_t *block, uintptr_t func)
static inline void jmp(codeblock_t *block, uintptr_t func) static inline void jmp(codeblock_t *block, uintptr_t func)
{ {
uintptr_t diff; intptr_t diff;
codegen_alloc_bytes(block, 5); codegen_alloc_bytes(block, 5);
diff = func - (uintptr_t)&block_write_data[block_pos + 5]; diff = (intptr_t)(func - (uintptr_t)&block_write_data[block_pos + 5]);
if (diff >= -0x80000000 && diff < 0x7fffffff) if (diff >= -0x80000000 && diff < 0x7fffffff)
{ {

2
src/codegen_new/codegen_reg.c
View File

@@ -513,7 +513,7 @@ void codegen_reg_write_imm(codeblock_t *block, ir_reg_t ir_reg, uint32_t imm_dat
case REG_DWORD: case REG_DWORD:
if ((uintptr_t)p < 256) if ((uintptr_t)p < 256)
codegen_direct_write_32_imm_stack(block, (int)p, imm_data); codegen_direct_write_32_imm_stack(block, (int)((uintptr_t) p), imm_data);
else else
codegen_direct_write_32_imm(block, p, imm_data); codegen_direct_write_32_imm(block, p, imm_data);
break; break;

4
src/qt/evdev_mouse.cpp
View File

@@ -56,7 +56,7 @@ void evdev_thread_func()
{ {
while (!stopped) while (!stopped)
{ {
for (int i = 0; i < evdev_mice.size(); i++) for (unsigned int i = 0; i < evdev_mice.size(); i++)
{ {
struct input_event ev; struct input_event ev;
int rc = libevdev_next_event(evdev_mice[i].second, LIBEVDEV_READ_FLAG_NORMAL, &ev); int rc = libevdev_next_event(evdev_mice[i].second, LIBEVDEV_READ_FLAG_NORMAL, &ev);
@@ -67,7 +67,7 @@ void evdev_thread_func()
} }
} }
} }
for (int i = 0; i < evdev_mice.size(); i++) for (unsigned int i = 0; i < evdev_mice.size(); i++)
{ {
libevdev_free(evdev_mice[i].second); libevdev_free(evdev_mice[i].second);
close(evdev_mice[i].first); close(evdev_mice[i].first);

2
src/qt/qt_harddiskdialog.cpp
View File

@@ -564,7 +564,7 @@ void HarddiskDialog::onExistingFileSelected(const QString &fileName) {
else if (((size % 3072) == 0) && (size <= 53477376)) else if (((size % 3072) == 0) && (size <= 53477376))
heads = 6; heads = 6;
else { else {
int i; uint32_t i;
for (i = 5; i < 16; i++) { for (i = 5; i < 16; i++) {
if (((size % (i << 9)) == 0) && (size <= ((i * 17) << 19))) if (((size % (i << 9)) == 0) && (size <= ((i * 17) << 19)))
break; break;