Merge branch 'pointer-arith' into master

* fix evaluate_ptr_add() when sizeof(offset) != sizeof(pointer)

3 files changed, 175 insertions, 2 deletions

diff --git a/evaluate.c b/evaluate.c
index 4814a6d5..3751039f 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -619,7 +619,7 @@ static struct symbol *evaluate_ptr_add(struct expression *expr, struct symbol *i
 		ctype = &ptr_ctype;
 	expr->ctype = ctype;
 
-	if (multiply == 1 && itype->bit_size >= bits_in_pointer)
+	if (multiply == 1 && itype->bit_size == bits_in_pointer)
 		return ctype;
 
 	if (index->type == EXPR_VALUE) {
@@ -639,7 +639,7 @@ static struct symbol *evaluate_ptr_add(struct expression *expr, struct symbol *i
 		return ctype;
 	}
 
-	if (itype->bit_size < bits_in_pointer)
+	if (itype->bit_size != bits_in_pointer)
 		index = cast_to(index, ssize_t_ctype);
 
 	if (multiply > 1) {
diff --git a/validation/linear/pointer-arith32.c b/validation/linear/pointer-arith32.c
new file mode 100644
index 00000000..531fd232
--- /dev/null
+++ b/validation/linear/pointer-arith32.c
@@ -0,0 +1,94 @@
+char *cps(char *data, short pos)
+{
+	data += pos;
+	return data;
+}
+
+int *ipss(int *data, short pos)
+{
+	data += pos;
+	return data;
+}
+int *ipus(int *data, unsigned short pos)
+{
+	data += pos;
+	return data;
+}
+
+char *cpq(char *data, long long pos)
+{
+	data += pos;
+	return data;
+}
+
+int *ipq_ref(int *data, long long pos)
+{
+	data = data + pos;
+	return data;
+}
+
+int *ipq(int *data, long long pos)
+{
+	data += pos;
+	return data;
+}
+
+/*
+ * check-name: pointer-arith32
+ * check-command: test-linearize -Wno-decl --arch=generic -m32 $file
+ *
+ * check-output-start
+cps:
+.L0:
+	<entry-point>
+	sext.32     %r2 <- (16) %arg2
+	add.32      %r5 <- %arg1, %r2
+	ret.32      %r5
+
+
+ipss:
+.L2:
+	<entry-point>
+	sext.32     %r10 <- (16) %arg2
+	mul.32      %r11 <- %r10, $4
+	add.32      %r14 <- %arg1, %r11
+	ret.32      %r14
+
+
+ipus:
+.L4:
+	<entry-point>
+	zext.32     %r19 <- (16) %arg2
+	mul.32      %r20 <- %r19, $4
+	add.32      %r23 <- %arg1, %r20
+	ret.32      %r23
+
+
+cpq:
+.L6:
+	<entry-point>
+	trunc.32    %r28 <- (64) %arg2
+	add.32      %r31 <- %arg1, %r28
+	ret.32      %r31
+
+
+ipq_ref:
+.L8:
+	<entry-point>
+	trunc.32    %r37 <- (64) %arg2
+	mul.32      %r38 <- %r37, $4
+	add.32      %r39 <- %arg1, %r38
+	ret.32      %r39
+
+
+ipq:
+.L10:
+	<entry-point>
+	trunc.32    %r43 <- (64) %arg2
+	mul.32      %r44 <- %r43, $4
+	add.32      %r47 <- %arg1, %r44
+	ret.32      %r47
+
+
+ * check-output-end
+ */
diff --git a/validation/linear/pointer-arith64.c b/validation/linear/pointer-arith64.c
new file mode 100644
index 00000000..dad10331
--- /dev/null
+++ b/validation/linear/pointer-arith64.c
@@ -0,0 +1,79 @@
+char *cps(char *data, short pos)
+{
+	data += pos;
+	return data;
+}
+
+int *ipss(int *data, short pos)
+{
+	data += pos;
+	return data;
+}
+int *ipus(int *data, unsigned short pos)
+{
+	data += pos;
+	return data;
+}
+
+int *ipsi(int *data, int pos)
+{
+	data += pos;
+	return data;
+}
+int *ipui(int *data, unsigned int pos)
+{
+	data += pos;
+	return data;
+}
+
+/*
+ * check-name: pointer-arith64
+ * check-command: test-linearize -Wno-decl --arch=generic -m64 $file
+ *
+ * check-output-start
+cps:
+.L0:
+	<entry-point>
+	sext.64     %r2 <- (16) %arg2
+	add.64      %r5 <- %arg1, %r2
+	ret.64      %r5
+
+
+ipss:
+.L2:
+	<entry-point>
+	sext.64     %r10 <- (16) %arg2
+	mul.64      %r11 <- %r10, $4
+	add.64      %r14 <- %arg1, %r11
+	ret.64      %r14
+
+
+ipus:
+.L4:
+	<entry-point>
+	zext.64     %r19 <- (16) %arg2
+	mul.64      %r20 <- %r19, $4
+	add.64      %r23 <- %arg1, %r20
+	ret.64      %r23
+
+
+ipsi:
+.L6:
+	<entry-point>
+	sext.64     %r28 <- (32) %arg2
+	mul.64      %r29 <- %r28, $4
+	add.64      %r32 <- %arg1, %r29
+	ret.64      %r32
+
+
+ipui:
+.L8:
+	<entry-point>
+	zext.64     %r37 <- (32) %arg2
+	mul.64      %r38 <- %r37, $4
+	add.64      %r41 <- %arg1, %r38
+	ret.64      %r41
+
+
+ * check-output-end
+ */