diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-11-06 18:11:56 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-11-06 18:11:56 +0000 |
| commit | d535ef006d85dbdb7cda2b09c5bc35cb80108909 (patch) | |
| tree | 6cf735f8392afea90b442eccc78b868cec4aab01 /compiler/codeGen | |
| parent | ab9e7e37baa71576f9dd8aaff07d10a330e5625d (diff) | |
| download | haskell-d535ef006d85dbdb7cda2b09c5bc35cb80108909.tar.gz | |
Allow the use of R9 and R10 in primops; fixes trac #5423
Diffstat (limited to 'compiler/codeGen')
| -rw-r--r-- | compiler/codeGen/CgUtils.hs | 12 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmUtils.hs | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/compiler/codeGen/CgUtils.hs b/compiler/codeGen/CgUtils.hs index 3ee47264e7..a0a5ac2554 100644 --- a/compiler/codeGen/CgUtils.hs +++ b/compiler/codeGen/CgUtils.hs @@ -350,6 +350,12 @@ callerSaves (VanillaReg 7 _) = True #ifdef CALLER_SAVES_R8 callerSaves (VanillaReg 8 _) = True #endif +#ifdef CALLER_SAVES_R9 +callerSaves (VanillaReg 9 _) = True +#endif +#ifdef CALLER_SAVES_R10 +callerSaves (VanillaReg 10 _) = True +#endif #ifdef CALLER_SAVES_F1 callerSaves (FloatReg 1) = True #endif @@ -921,6 +927,12 @@ activeStgRegs = [ #ifdef REG_R8 ,VanillaReg 8 VGcPtr #endif +#ifdef REG_R9 + ,VanillaReg 9 VGcPtr +#endif +#ifdef REG_R10 + ,VanillaReg 10 VGcPtr +#endif #ifdef REG_SpLim ,SpLim #endif diff --git a/compiler/codeGen/StgCmmUtils.hs b/compiler/codeGen/StgCmmUtils.hs index ca0d23a3ac..f209005108 100644 --- a/compiler/codeGen/StgCmmUtils.hs +++ b/compiler/codeGen/StgCmmUtils.hs @@ -327,6 +327,12 @@ callerSaves (VanillaReg 7 _) = True #ifdef CALLER_SAVES_R8 callerSaves (VanillaReg 8 _) = True #endif +#ifdef CALLER_SAVES_R9 +callerSaves (VanillaReg 9 _) = True +#endif +#ifdef CALLER_SAVES_R10 +callerSaves (VanillaReg 10 _) = True +#endif #ifdef CALLER_SAVES_F1 callerSaves (FloatReg 1) = True #endif |