Changeset 564e39 in git

Timestamp:

Nov 4, 2013, 4:13:37 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

1afbfecf50023bb1685a0c650d68e81aa9dc02ff

Parents:

1e90486b053bee6ef36b924bb2ff2e91e6cf165c

Message:

fix: convert ptr to int via intptr_t

Location:

factory

Files:

• canonicalform.h (modified) (1 diff)
• imm.h (modified) (3 diffs)
• singext.cc (modified) (1 diff)

factory/canonicalform.h

@@ -51 +51 @@
 {
     // returns 0 if ptr is not immediate
-    return ( ((int)((long)ptr)) & 3 );
+    return ( ((int)((intptr_t)ptr)) & 3 );
 }
 

factory/imm.h

@@ -57 +57 @@
 inline long imm2int ( const InternalCF * const imm )
 {
-    return ((long)imm) >> 2;
+    return ((intptr_t)imm) >> 2;
 }
 
@@ -70 +70 @@
 {
     // this could be better done by masking the sign bit
-    if ( ((int)((long)imm)) < 0 )
-        return -((-(long)imm) >> 2);
-    else
-        return (long)imm >> 2;
+    if ( ((int)((intptr_t)imm)) < 0 )
+        return -((-(intptr_t)imm) >> 2);
+    else
+        return (intptr_t)imm >> 2;
 }
 
@@ -102 +102 @@
 {
     // returns 0 if ptr is not immediate
-    return ( (long)ptr & 3 );
+    return ( (intptr_t)ptr & 3 );
 }
 #endif

factory/singext.cc

@@ -61 +61 @@
 {
     InternalCF * ff = f.getval();
-    return ((long)ff) >>2;
+    return ((intptr_t)ff) >>2;
 }