diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2018-04-22 12:48:11 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2018-05-16 13:36:13 +0100 |
| commit | fbd28e2c6b5f1302cd2d36d79149e3b0a9f01d84 (patch) | |
| tree | 347862078aab1df4d1c268ae4cd880e46fc55de3 /compiler/llvmGen/LlvmCodeGen/Data.hs | |
| parent | eb8e692cab7970c495681e14721d05ecadd21581 (diff) | |
| download | haskell-fbd28e2c6b5f1302cd2d36d79149e3b0a9f01d84.tar.gz | |
Allow CmmLabelDiffOff with different widths
Summary:
This change makes it possible to generate a static 32-bit relative label
offset on x86_64. Currently we can only generate word-sized label
offsets.
This will be used in D4634 to shrink info tables. See D4632 for more
details.
Test Plan: See D4632
Reviewers: bgamari, niteria, michalt, erikd, jrtc27, osa1
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D4633
Diffstat (limited to 'compiler/llvmGen/LlvmCodeGen/Data.hs')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/Data.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen/Data.hs b/compiler/llvmGen/LlvmCodeGen/Data.hs index 89b8fe7013..36d51e9e18 100644 --- a/compiler/llvmGen/LlvmCodeGen/Data.hs +++ b/compiler/llvmGen/LlvmCodeGen/Data.hs @@ -148,12 +148,14 @@ genStaticLit (CmmLabelOff label off) = do let offset = LMStaticLit $ LMIntLit (toInteger off) (llvmWord dflags) return $ LMAdd var offset -genStaticLit (CmmLabelDiffOff l1 l2 off) = do +genStaticLit (CmmLabelDiffOff l1 l2 off w) = do dflags <- getDynFlags var1 <- genStaticLit (CmmLabel l1) var2 <- genStaticLit (CmmLabel l2) - let var = LMSub var1 var2 - offset = LMStaticLit $ LMIntLit (toInteger off) (llvmWord dflags) + let var + | w == wordWidth dflags = LMSub var1 var2 + | otherwise = LMTrunc (LMSub var1 var2) (widthToLlvmInt w) + offset = LMStaticLit $ LMIntLit (toInteger off) (LMInt $ widthInBits w) return $ LMAdd var offset genStaticLit (CmmBlock b) = genStaticLit $ CmmLabel $ infoTblLbl b |