fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium: Silence compiler warnings on Windows.

Browse source
This commit is contained in:
Michal Krol 2008-02-20 22:10:27 +01:00 • committed by José Fonseca
parent 69a7c9739b
commit 57060bc1fa
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
View file

@ -25,6 +25,7 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#include "pipe/p_debug.h" #include "pipe/p_debug.h"
#include "pipe/p_pointer.h"
#include "rtasm_execmem.h" #include "rtasm_execmem.h"
#include "rtasm_x86sse.h" #include "rtasm_x86sse.h"
@ -34,7 +35,7 @@
static unsigned char *cptr( void (*label)() ) static unsigned char *cptr( void (*label)() )
{ {
return (unsigned char *)(unsigned long)label; return (unsigned char *) label;
} }
@ -46,7 +47,7 @@ static void do_realloc( struct x86_function *p )
p->csr = p->store; p->csr = p->store;
} }
else { else {
unsigned used = p->csr - p->store; uintptr_t used = pointer_to_uintptr( p->csr ) - pointer_to_uintptr( p->store );
unsigned char *tmp = p->store; unsigned char *tmp = p->store;
p->size *= 2; p->size *= 2;
p->store = rtasm_exec_malloc(p->size); p->store = rtasm_exec_malloc(p->size);
@ -60,7 +61,7 @@ static void do_realloc( struct x86_function *p )
*/ */
static unsigned char *reserve( struct x86_function *p, int bytes ) static unsigned char *reserve( struct x86_function *p, int bytes )
{ {
if (p->csr + bytes - p->store > p->size) if (p->csr + bytes - p->store > (int) p->size)
do_realloc(p); do_realloc(p);
{ {
@ -135,7 +136,7 @@ static void emit_modrm( struct x86_function *p,
case mod_INDIRECT: case mod_INDIRECT:
break; break;
case mod_DISP8: case mod_DISP8:
emit_1b(p, regmem.disp); emit_1b(p, (char) regmem.disp);
break; break;
case mod_DISP32: case mod_DISP32:
emit_1i(p, regmem.disp); emit_1i(p, regmem.disp);
@ -251,14 +252,14 @@ void x86_jcc( struct x86_function *p,
enum x86_cc cc, enum x86_cc cc,
unsigned char *label ) unsigned char *label )
{ {
int offset = label - (x86_get_label(p) + 2); intptr_t offset = pointer_to_intptr( label ) - (pointer_to_intptr( x86_get_label(p) ) + 2);
if (offset <= 127 && offset >= -128) { if (offset <= 127 && offset >= -128) {
emit_1ub(p, 0x70 + cc); emit_1ub(p, 0x70 + cc);
emit_1b(p, (char) offset); emit_1b(p, (char) offset);
} }
else { else {
offset = label - (x86_get_label(p) + 6); offset = pointer_to_intptr( label ) - (pointer_to_intptr( x86_get_label(p) ) + 6);
emit_2ub(p, 0x0f, 0x80 + cc); emit_2ub(p, 0x0f, 0x80 + cc);
emit_1i(p, offset); emit_1i(p, offset);
} }
@ -293,13 +294,13 @@ unsigned char *x86_call_forward( struct x86_function *p)
void x86_fixup_fwd_jump( struct x86_function *p, void x86_fixup_fwd_jump( struct x86_function *p,
unsigned char *fixup ) unsigned char *fixup )
{ {
*(int *)(fixup - 4) = x86_get_label(p) - fixup; *(int *)(fixup - 4) = pointer_to_intptr( x86_get_label(p) ) - pointer_to_intptr( fixup );
} }
void x86_jmp( struct x86_function *p, unsigned char *label) void x86_jmp( struct x86_function *p, unsigned char *label)
{ {
emit_1ub(p, 0xe9); emit_1ub(p, 0xe9);
emit_1i(p, label - x86_get_label(p) - 4); emit_1i(p, pointer_to_intptr( label ) - pointer_to_intptr( x86_get_label(p) ) - 4);
} }
#if 0 #if 0
@ -1207,7 +1208,7 @@ void (*x86_get_func( struct x86_function *p ))(void)
{ {
if (DISASSEM && p->store) if (DISASSEM && p->store)
debug_printf("disassemble %p %p\n", p->store, p->csr); debug_printf("disassemble %p %p\n", p->store, p->csr);
return (void (*)(void)) (unsigned long) p->store; return (void (*)(void)) p->store;
} }
#else #else