diff options
| -rw-r--r-- | bootstrap/test.cff | 3 | ||||
| -rw-r--r-- | src/llvm.cff | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bootstrap/test.cff b/bootstrap/test.cff index 0fd9333..6a2b736 100644 --- a/bootstrap/test.cff +++ b/bootstrap/test.cff @@ -95,7 +95,7 @@ extern fn main (argc int, argv **u8) int { let x = Number:none; let x = Number:int{}; - let is []int = { [4] = 1, 2, [1 - 1] = 3 }; + let is []int = { [4] = -1, 2, [1 - 1] = 3 }; isort(is, is.#len); each(i, x, is, printf("%d\n", x); @@ -109,6 +109,7 @@ extern fn main (argc int, argv **u8) int { slice = slice[1::4]; printf("sl %d\n", slice[0]); slice.#len; + printf("%c\n", "ABCD"[1::][0]); let const v Vec2f = {}; // v->zero(); diff --git a/src/llvm.cff b/src/llvm.cff index 3dcebe6..e23b65d 100644 --- a/src/llvm.cff +++ b/src/llvm.cff @@ -734,8 +734,10 @@ fn genexpr(f *Fn, ex *Expr) Value { let end = convert(f, ty_usize, sl.end); let len = mktmp(ty_usize); gen("\t%v = sub %t %v, %v\n", len, ty_usize, end, begin); + let addr2 = mktmp(addr.ty); + gen("\t%v = getelementptr %t, %t %v, %t %v\n", addr2, ex.ty.u.Slice, addr.ty, addr, ty_usize, begin); let tmp = mktmp(ex.ty); - gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr.ty, addr); + gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr2.ty, addr2); let res = mktmp(ex.ty); gen("\t%v = insertvalue %t %v, %t %v, 1\n", res, ex.ty, tmp, len.ty, len); return res; @@ -745,8 +747,10 @@ fn genexpr(f *Fn, ex *Expr) Value { let end = convert(f, ty_usize, sl.end); let len = mktmp(ty_usize); gen("\t%v = sub %t %v, %v\n", len, ty_usize, end, begin); + let addr2 = mktmp(addr.ty); + gen("\t%v = getelementptr %t, %t %v, %t %v\n", addr2, ex.ty.u.Slice, addr.ty, addr, ty_usize, begin); let tmp = mktmp(ex.ty); - gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr.ty, addr); + gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr2.ty, addr2); let res = mktmp(ex.ty); gen("\t%v = insertvalue %t %v, %t %v, 1\n", res, ex.ty, tmp, len.ty, len); return res; @@ -758,8 +762,10 @@ fn genexpr(f *Fn, ex *Expr) Value { gen("\t%v = extractvalue %t %v, 0", addr, ex.ty, slice); let len = mktmp(ty_usize); gen("\t%v = sub %t %v, %v\n", len, ty_usize, end, begin); + let addr2 = mktmp(addr.ty); + gen("\t%v = getelementptr %t, %t %v, %t %v\n", addr2, ex.ty.u.Slice, addr.ty, addr, ty_usize, begin); let tmp = mktmp(ex.ty); - gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr.ty, addr); + gen("\t%v = insertvalue %t undef, %t %v, 0\n", tmp, ex.ty, addr2.ty, addr2); let res = mktmp(ex.ty); gen("\t%v = insertvalue %t %v, %t %v, 1\n", res, ex.ty, tmp, len.ty, len); return res; |