merge

[plan9front.git] / sys / src / 9 / kw / fpiarm.c

diff --git a/sys/src/9/kw/fpiarm.c b/sys/src/9/kw/fpiarm.c
index 8d5a20e52ae6baee24abb780e6eb9e5aa60d26d1..80b7ceae0cbedd647c2476f436c7fae45f285371 100644 (file)
--- a/sys/src/9/kw/fpiarm.c
+++ b/sys/src/9/kw/fpiarm.c
@@ -648,7 +648,7 @@ casemu(ulong pc, ulong op, Ureg *ur)
        rn = rp[op>>0 & 0x7];
        rd = rp + (op>>12 & 0x7);
        rp = (ulong*)*rd;
-       validaddr((ulong)rp, 4, 1);
+       validaddr((uintptr)rp, 4, 1);
        splhi();
        if(*rd = (*rp == ro))
                *rp = rn;
@@ -667,7 +667,7 @@ ldrex(ulong pc, ulong op, Ureg *ur)
        rp = (ulong*)ur;
        rd = rp + (op>>16 & 0x7);
        addr = (ulong*)*rd;
-       validaddr((ulong)addr, 4, 0);
+       validaddr((uintptr)addr, 4, 0);
        ldrexvalid = 1;
        rp[op>>12 & 0x7] = *addr;
        if(fpemudebug)
@@ -686,7 +686,7 @@ strex(ulong pc, ulong op, Ureg *ur)
        rd = rp + (op>>16 & 0x7);
        rn = rp[op>>0 & 0x7];
        addr = (ulong*)*rd;
-       validaddr((ulong)addr, 4, 1);
+       validaddr((uintptr)addr, 4, 1);
        splhi();
        if(ldrexvalid){
                if(fpemudebug)
@@ -726,7 +726,7 @@ fpiarm(Ureg *ur)
 
        if(up == nil)
                panic("fpiarm not in a process");
-       ufp = &up->fpsave;
+       ufp = up->fpsave;
        /*
         * because all the emulated fp state is in the proc structure,
         * it need not be saved/restored