Author: leo
Date: Thu Aug 4 00:35:53 2005
New Revision: 8802
Modified:
trunk/include/parrot/pic.h
trunk/io/io.c
trunk/src/gc_ims.c
trunk/src/headers.c
trunk/src/pic.c
Log:
fix amd64 int - pointer casts
Modified: trunk/include/parrot/pic.h
==============================================================================
--- trunk/include/parrot/pic.h (original)
+++ trunk/include/parrot/pic.h Thu Aug 4 00:35:53 2005
@@ -71,7 +71,7 @@ Parrot_PIC* parrot_PIC_alloc_pic(Interp*
void parrot_pic_find_infix_v_pp(Interp *, PMC *left, PMC *right,
Parrot_MIC *mic, opcode_t *cur_opcode);
-void * parrot_pic_opcode(Interp *, int op);
+void * parrot_pic_opcode(Interp *, INTVAL op);
#endif /* PARROT_PIC_H_GUARD */
Modified: trunk/io/io.c
==============================================================================
--- trunk/io/io.c (original)
+++ trunk/io/io.c Thu Aug 4 00:35:53 2005
@@ -1010,7 +1010,7 @@ PIO_putps(theINTERP, PMC *pmc, STRING *s
{
ParrotIOLayer *l = PMC_struct_val(pmc);
ParrotIO *io = PMC_data0(pmc);
- assert((unsigned int)l != 0xdeadbeefU);
+ assert((unsigned long)l != 0xdeadbeefUL);
assert(io != 0);
#if ! DISABLE_GC_DEBUG
/* trigger GC for debug - but not during tests */
Modified: trunk/src/gc_ims.c
==============================================================================
--- trunk/src/gc_ims.c (original)
+++ trunk/src/gc_ims.c Thu Aug 4 00:35:53 2005
@@ -706,7 +706,7 @@ static int
collect_cb(Interp *interpreter, struct Small_Object_Pool *pool, int flag,
void *arg)
{
- int check_only = (int)arg;
+ int check_only = (int)(INTVAL)arg;
struct Memory_Pool *mem_pool;
/*
* check if there is an associate memory pool
@@ -740,7 +740,7 @@ collect_cb(Interp *interpreter, struct S
}
static int
-parrot_gc_ims_collect(Interp* interpreter, int check_only)
+parrot_gc_ims_collect(Interp* interpreter, INTVAL check_only)
{
struct Arenas *arena_base = interpreter->arena_base;
Gc_ims_private *g_ims;
Modified: trunk/src/headers.c
==============================================================================
--- trunk/src/headers.c (original)
+++ trunk/src/headers.c Thu Aug 4 00:35:53 2005
@@ -706,7 +706,7 @@ static int
sweep_cb_buf(Interp *interpreter, struct Small_Object_Pool *pool, int flag,
void *arg)
{
- int pass = (int)arg;
+ int pass = (int)(INTVAL)arg;
#ifdef GC_IS_MALLOC
if (pass == 0)
@@ -735,7 +735,7 @@ sweep_cb_pmc(Interp *interpreter, struct
void
Parrot_destroy_header_pools(Interp *interpreter)
{
- int pass, start;
+ INTVAL pass, start;
/* const/non const COW strings life in different pools
* so in first pass
Modified: trunk/src/pic.c
==============================================================================
--- trunk/src/pic.c (original)
+++ trunk/src/pic.c Thu Aug 4 00:35:53 2005
@@ -235,7 +235,7 @@ this opcode function is available. Calle
void *
-parrot_pic_opcode(Interp *interpreter, int op)
+parrot_pic_opcode(Interp *interpreter, INTVAL op)
{
int core = interpreter->run_core;
#ifdef HAVE_COMPUTED_GOTO
@@ -389,7 +389,7 @@ parrot_pic_find_infix_v_pp(Interp *inter
mic->lru.f.sub = (PMC*)F2DPTR(func);
}
else {
- int op = PARROT_OP_pic_infix___ic_p_p;
+ INTVAL op = PARROT_OP_pic_infix___ic_p_p;
#if ENABLE_INLINING
if (func == (funcptr_t)Parrot_Integer_i_subtract_Integer && !mic->pic)
