Rakarake/churf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Realized that getelementptr might be doing to right thing, and that the uninitialized data comes from padding.

Browse source
This commit is contained in:
Samuel Hammersberg 2023-03-22 10:24:00 +01:00
parent ae34c494f5
commit d36370329e
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/Codegen/Codegen.hs
View file

@ -151,13 +151,14 @@ compileScs [] = do
-- set the first byte to the index of the constructor -- set the first byte to the index of the constructor
emit $ SetVariable ptr $ emit $ SetVariable ptr $
GetElementPtrInbounds t' (Ref t') GetElementPtr t' (Ref t') (VIdent top I8)
(VIdent top I8) I32 (VInteger 0) I32 (VInteger 0) I64 (VInteger 0)
I32 (VInteger 0)
emit $ Store I8 (VInteger $ numCI ci ) (Ref I8) ptr emit $ Store I8 (VInteger $ numCI ci ) (Ref I8) ptr
-- get a pointer of the correct type -- get a pointer of the correct type
ptr' <- GA.Ident . show <$> getNewVar ptr' <- GA.Ident . show <$> getNewVar
emit $ SetVariable ptr' (Bitcast (Ref t') ptr (Ref $ CustomType id)) emit $ SetVariable ptr' (Bitcast (Ref t') top (Ref $ CustomType id))
--emit $ UnsafeRaw "\n" --emit $ UnsafeRaw "\n"
@ -166,9 +167,10 @@ compileScs [] = do
emit $ Comment (show arg_t' <>" "<> arg_n <> " " <> show i ) emit $ Comment (show arg_t' <>" "<> arg_n <> " " <> show i )
elemPtr <- GA.Ident . show <$> getNewVar elemPtr <- GA.Ident . show <$> getNewVar
emit $ SetVariable elemPtr ( emit $ SetVariable elemPtr (
GetElementPtrInbounds (CustomType id) (Ref (CustomType id)) GetElementPtr (CustomType id) (Ref (CustomType id))
(VIdent ptr' Ptr) I32 (VIdent ptr' Ptr)
(VInteger 0) I32 (VInteger i)) I64 (VInteger 0)
I32 (VInteger i))
emit $ Store arg_t' (VIdent (GA.Ident arg_n) arg_t') Ptr elemPtr emit $ Store arg_t' (VIdent (GA.Ident arg_n) arg_t') Ptr elemPtr
-- %2 = getelementptr inbounds %Foo_AInteger, %Foo_AInteger* %1, i32 0, i32 1 -- %2 = getelementptr inbounds %Foo_AInteger, %Foo_AInteger* %1, i32 0, i32 1
-- store i32 42, i32* %2 -- store i32 42, i32* %2
@ -178,6 +180,7 @@ compileScs [] = do
--emit $ UnsafeRaw "\n" --emit $ UnsafeRaw "\n"
-- load and return the constructed value -- load and return the constructed value
emit $ Comment "Return the newly constructed value"
load <- GA.Ident . show <$> getNewVar load <- GA.Ident . show <$> getNewVar
emit $ SetVariable load (Load t' Ptr top) emit $ SetVariable load (Load t' Ptr top)
emit $ Ret t' (VIdent load t') emit $ Ret t' (VIdent load t')
@ -213,9 +216,9 @@ mainContent var =
[ UnsafeRaw $ [ UnsafeRaw $
"%2 = alloca %Craig\n" <> "%2 = alloca %Craig\n" <>
" store %Craig %1, ptr %2\n" <> " store %Craig %1, ptr %2\n" <>
" %3 = bitcast %Craig* %2 to i64*\n" <> " %3 = bitcast %Craig* %2 to i72*\n" <>
" %4 = load i64, ptr %3\n" <> " %4 = load i72, ptr %3\n" <>
" call i32 (ptr, ...) @printf(ptr noundef @.str, i64 noundef %4)\n" " call i32 (ptr, ...) @printf(ptr noundef @.str, i72 noundef %4)\n"
-- "call i32 (ptr, ...) @printf(ptr noundef @.str, i64 noundef " <> show var <> ")\n" -- "call i32 (ptr, ...) @printf(ptr noundef @.str, i64 noundef " <> show var <> ")\n"
, -- , SetVariable (GA.Ident "p") (Icmp LLEq I64 (VInteger 2) (VInteger 2)) , -- , SetVariable (GA.Ident "p") (Icmp LLEq I64 (VInteger 2) (VInteger 2))
-- , BrCond (VIdent (GA.Ident "p")) (GA.Ident "b_1") (GA.Ident "b_2") -- , BrCond (VIdent (GA.Ident "p")) (GA.Ident "b_1") (GA.Ident "b_2")
@ -234,7 +237,7 @@ mainContent var =
defaultStart :: [LLVMIr] defaultStart :: [LLVMIr]
defaultStart = [ UnsafeRaw "target triple = \"x86_64-pc-linux-gnu\"\n" defaultStart = [ UnsafeRaw "target triple = \"x86_64-pc-linux-gnu\"\n"
, UnsafeRaw "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n" , UnsafeRaw "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"\n"
, UnsafeRaw "@.str = private unnamed_addr constant [3 x i8] c\"%i\n\", align 1\n" , UnsafeRaw "@.str = private unnamed_addr constant [3 x i8] c\"%x\n\", align 1\n"
, UnsafeRaw "declare i32 @printf(ptr noalias nocapture, ...)\n" , UnsafeRaw "declare i32 @printf(ptr noalias nocapture, ...)\n"
] ]

7
src/Codegen/LlvmIr.hs
View file

@ -106,6 +106,7 @@ data LLVMIr
| Declare LLVMType Ident Params | Declare LLVMType Ident Params
| SetVariable Ident LLVMIr | SetVariable Ident LLVMIr
| Variable Ident | Variable Ident
| GetElementPtr LLVMType LLVMType LLVMValue LLVMType LLVMValue LLVMType LLVMValue
| GetElementPtrInbounds LLVMType LLVMType LLVMValue LLVMType LLVMValue LLVMType LLVMValue | GetElementPtrInbounds LLVMType LLVMType LLVMValue LLVMType LLVMValue LLVMType LLVMValue
| Add LLVMType LLVMValue LLVMValue | Add LLVMType LLVMValue LLVMValue
| Sub LLVMType LLVMValue LLVMValue | Sub LLVMType LLVMValue LLVMValue
@ -146,6 +147,12 @@ llvmIrToString = go 0
insToString :: Int -> LLVMIr -> String insToString :: Int -> LLVMIr -> String
insToString i l = insToString i l =
replicate i '\t' <> case l of replicate i '\t' <> case l of
(GetElementPtr t1 t2 p t3 v1 t4 v2) -> do
-- getelementptr inbounds %Foo, %Foo* %x, i32 0, i32 0
concat
[ "getelementptr ", show t1, ", " , show t2
, " ", show p, ", ", show t3, " ", show v1,
", ", show t4, " ", show v2, "\n" ]
(GetElementPtrInbounds t1 t2 p t3 v1 t4 v2) -> do (GetElementPtrInbounds t1 t2 p t3 v1 t4 v2) -> do
-- getelementptr inbounds %Foo, %Foo* %x, i32 0, i32 0 -- getelementptr inbounds %Foo, %Foo* %x, i32 0, i32 0
concat concat