properly handle loads of i24s and similar illegal values

3 files changed, 53 insertions, 8 deletions

diff --git a/src/analyzer.js b/src/analyzer.js
index 1d32d7fc..b1f0b585 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -502,18 +502,38 @@ function analyzer(data, sidePass) {
                         { intertype: 'value', ident: j.toString(), type: 'i32' }
                       ]
                     });
-                    var actualSizeType = 'i' + element.bits; // The last one may be smaller than 32 bits
-                    toAdd.push({
+                    var newItem = {
                       intertype: 'load',
                       assignTo: element.ident,
-                      pointerType: actualSizeType + '*',
-                      valueType: actualSizeType,
-                      type: actualSizeType, // XXX why is this missing from intertyper?
-                      pointer: { intertype: 'value', ident: tempVar, type: actualSizeType + '*' },
+                      pointerType: 'i32*',
+                      valueType: 'i32',
+                      type: 'i32',
+                      pointer: { intertype: 'value', ident: tempVar, type: 'i32*' },
                       ident: tempVar,
-                      pointerType: actualSizeType + '*',
                       align: value.align
-                    });
+                    };
+                    var newItem2 = null;
+                    // The last one may be smaller than 32 bits
+                    if (element.bits < 32) {
+                      newItem.assignTo += '$preadd$';
+                      newItem2 = {
+                        intertype: 'mathop',
+                        op: 'and',
+                        assignTo: element.ident,
+                        type: 'i32',
+                        params: [{
+                          intertype: 'value',
+                          type: 'i32',
+                          ident: newItem.assignTo
+                        }, {
+                          intertype: 'value',
+                          type: 'i32',
+                          ident: (0xffffffff >>> (32 - element.bits)).toString()
+                        }],
+                      };
+                    }
+                    toAdd.push(newItem);
+                    if (newItem2) toAdd.push(newItem2);
                     j++;
                   });
                   Types.needAnalysis['[0 x i32]'] = 0;
diff --git a/tests/cases/i32_mem.ll b/tests/cases/i32_mem.ll
new file mode 100644
index 00000000..e50014ca
--- /dev/null
+++ b/tests/cases/i32_mem.ll
@@ -0,0 +1,23 @@
+; ModuleID = 'tests/hello_world.bc'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
+target triple = "i386-pc-linux-gnu"
+
+@.str = private unnamed_addr constant [15 x i8] c".%x.\0A\00", align 1 ; [#uses=1 type=[5 x i8]*]
+
+define i32 @main() {
+entry:
+  %mem = alloca i32
+  store i32 4279383126, i32* %mem
+  %i24 = bitcast i32* %mem to i24*
+  %load = load i24* %i24, align 4
+  %load32 = zext i24 %load to i32
+  %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([5 x i8]* @.str, i32 0, i32 0), i32 %load32)
+  %val_24 = trunc i32 4041265344 to i24
+  store i24 %val_24, i24* %i24, align 4
+  %load32b = load i32* %mem, align 4
+  %call2 = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([5 x i8]* @.str, i32 0, i32 0), i32 %load32b)
+  ret i32 1
+}
+
+; [#uses=1]
+declare i32 @printf(i8*, ...)
diff --git a/tests/cases/i32_mem.txt b/tests/cases/i32_mem.txt
new file mode 100644
index 00000000..683e58e2
--- /dev/null
+++ b/tests/cases/i32_mem.txt
@@ -0,0 +1,2 @@
+.123456.
+.ffe0d0c0.