summaryrefslogtreecommitdiff
path: root/includes/stg/Regs.h
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2012-10-03 09:30:56 +0100
committerSimon Marlow <marlowsd@gmail.com>2012-10-08 09:04:40 +0100
commita7c0387d20c1c9994d1100b14fbb8fb4e28a259e (patch)
treeb95d0a512f951a4a463f1aa5178b0cd5c4fdb410 /includes/stg/Regs.h
parentaed37acd4d157791381800d5de960a2461bcbef3 (diff)
downloadhaskell-a7c0387d20c1c9994d1100b14fbb8fb4e28a259e.tar.gz
Produce new-style Cmm from the Cmm parser
The main change here is that the Cmm parser now allows high-level cmm code with argument-passing and function calls. For example: foo ( gcptr a, bits32 b ) { if (b > 0) { // we can make tail calls passing arguments: jump stg_ap_0_fast(a); } return (x,y); } More details on the new cmm syntax are in Note [Syntax of .cmm files] in CmmParse.y. The old syntax is still more-or-less supported for those occasional code fragments that really need to explicitly manipulate the stack. However there are a couple of differences: it is now obligatory to give a list of live GlobalRegs on every jump, e.g. jump %ENTRY_CODE(Sp(0)) [R1]; Again, more details in Note [Syntax of .cmm files]. I have rewritten most of the .cmm files in the RTS into the new syntax, except for AutoApply.cmm which is generated by the genapply program: this file could be generated in the new syntax instead and would probably be better off for it, but I ran out of enthusiasm. Some other changes in this batch: - The PrimOp calling convention is gone, primops now use the ordinary NativeNodeCall convention. This means that primops and "foreign import prim" code must be written in high-level cmm, but they can now take more than 10 arguments. - CmmSink now does constant-folding (should fix #7219) - .cmm files now go through the cmmPipeline, and as a result we generate better code in many cases. All the object files generated for the RTS .cmm files are now smaller. Performance should be better too, but I haven't measured it yet. - RET_DYN frames are removed from the RTS, lots of code goes away - we now have some more canned GC points to cover unboxed-tuples with 2-4 pointers, which will reduce code size a little.
Diffstat (limited to 'includes/stg/Regs.h')
-rw-r--r--includes/stg/Regs.h331
1 files changed, 3 insertions, 328 deletions
diff --git a/includes/stg/Regs.h b/includes/stg/Regs.h
index bf17b7e825..70e93d3234 100644
--- a/includes/stg/Regs.h
+++ b/includes/stg/Regs.h
@@ -93,10 +93,10 @@ typedef struct {
/*
* Registers Hp and HpLim are global across the entire system, and are
- * copied into the RegTable before executing a thread.
+ * copied into the RegTable or registers before executing a thread.
*
- * Registers Sp and SpLim are saved in the TSO for the
- * thread, but are copied into the RegTable before executing a thread.
+ * Registers Sp and SpLim are saved in the TSO for the thread, but are
+ * copied into the RegTable or registers before executing a thread.
*
* All other registers are "general purpose", and are used for passing
* arguments to functions, and returning values. The code generator
@@ -116,45 +116,6 @@ typedef struct {
* (pseudo-)registers in those cases.
*/
-/*
- * Locations for saving per-thread registers.
- */
-
-#define SAVE_Sp (CurrentTSO->sp)
-#define SAVE_SpLim (CurrentTSO->splim)
-
-#define SAVE_Hp (BaseReg->rHp)
-
-#define SAVE_CurrentTSO (BaseReg->rCurrentTSO)
-#define SAVE_CurrentNursery (BaseReg->rCurrentNursery)
-#define SAVE_HpAlloc (BaseReg->rHpAlloc)
-
-/* We sometimes need to save registers across a C-call, eg. if they
- * are clobbered in the standard calling convention. We define the
- * save locations for all registers in the register table.
- */
-
-#define SAVE_R1 (BaseReg->rR1)
-#define SAVE_R2 (BaseReg->rR2)
-#define SAVE_R3 (BaseReg->rR3)
-#define SAVE_R4 (BaseReg->rR4)
-#define SAVE_R5 (BaseReg->rR5)
-#define SAVE_R6 (BaseReg->rR6)
-#define SAVE_R7 (BaseReg->rR7)
-#define SAVE_R8 (BaseReg->rR8)
-#define SAVE_R9 (BaseReg->rR9)
-#define SAVE_R10 (BaseReg->rR10)
-
-#define SAVE_F1 (BaseReg->rF1)
-#define SAVE_F2 (BaseReg->rF2)
-#define SAVE_F3 (BaseReg->rF3)
-#define SAVE_F4 (BaseReg->rF4)
-
-#define SAVE_D1 (BaseReg->rD1)
-#define SAVE_D2 (BaseReg->rD2)
-
-#define SAVE_L1 (BaseReg->rL1)
-
/* -----------------------------------------------------------------------------
* Emit the GCC-specific register declarations for each machine
* register being used. If any STG register isn't mapped to a machine
@@ -163,11 +124,6 @@ typedef struct {
* First, the general purpose registers. The idea is, if a particular
* general-purpose STG register can't be mapped to a real machine
* register, it won't be used at all. Instead, we'll use the stack.
- *
- * This is an improvement on the way things used to be done, when all
- * registers were mapped to locations in the register table, and stuff
- * was being shifted from the stack to the register table and back
- * again for no good reason (on register-poor architectures).
*/
/* define NO_REGS to omit register declarations - used in RTS C code
@@ -402,287 +358,6 @@ GLOBAL_REG_DECL(bdescr *,HpAlloc,REG_HpAlloc)
#define stg_gc_enter_1 (FunReg->stgGCEnter1)
#define stg_gc_fun (FunReg->stgGCFun)
-/* -----------------------------------------------------------------------------
- For any registers which are denoted "caller-saves" by the C calling
- convention, we have to emit code to save and restore them across C
- calls.
- -------------------------------------------------------------------------- */
-
-#ifdef CALLER_SAVES_R1
-#define CALLER_SAVE_R1 SAVE_R1 = R1;
-#define CALLER_RESTORE_R1 R1 = SAVE_R1;
-#else
-#define CALLER_SAVE_R1 /* nothing */
-#define CALLER_RESTORE_R1 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R2
-#define CALLER_SAVE_R2 SAVE_R2 = R2;
-#define CALLER_RESTORE_R2 R2 = SAVE_R2;
-#else
-#define CALLER_SAVE_R2 /* nothing */
-#define CALLER_RESTORE_R2 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R3
-#define CALLER_SAVE_R3 SAVE_R3 = R3;
-#define CALLER_RESTORE_R3 R3 = SAVE_R3;
-#else
-#define CALLER_SAVE_R3 /* nothing */
-#define CALLER_RESTORE_R3 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R4
-#define CALLER_SAVE_R4 SAVE_R4 = R4;
-#define CALLER_RESTORE_R4 R4 = SAVE_R4;
-#else
-#define CALLER_SAVE_R4 /* nothing */
-#define CALLER_RESTORE_R4 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R5
-#define CALLER_SAVE_R5 SAVE_R5 = R5;
-#define CALLER_RESTORE_R5 R5 = SAVE_R5;
-#else
-#define CALLER_SAVE_R5 /* nothing */
-#define CALLER_RESTORE_R5 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R6
-#define CALLER_SAVE_R6 SAVE_R6 = R6;
-#define CALLER_RESTORE_R6 R6 = SAVE_R6;
-#else
-#define CALLER_SAVE_R6 /* nothing */
-#define CALLER_RESTORE_R6 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R7
-#define CALLER_SAVE_R7 SAVE_R7 = R7;
-#define CALLER_RESTORE_R7 R7 = SAVE_R7;
-#else
-#define CALLER_SAVE_R7 /* nothing */
-#define CALLER_RESTORE_R7 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R8
-#define CALLER_SAVE_R8 SAVE_R8 = R8;
-#define CALLER_RESTORE_R8 R8 = SAVE_R8;
-#else
-#define CALLER_SAVE_R8 /* nothing */
-#define CALLER_RESTORE_R8 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R9
-#define CALLER_SAVE_R9 SAVE_R9 = R9;
-#define CALLER_RESTORE_R9 R9 = SAVE_R9;
-#else
-#define CALLER_SAVE_R9 /* nothing */
-#define CALLER_RESTORE_R9 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_R10
-#define CALLER_SAVE_R10 SAVE_R10 = R10;
-#define CALLER_RESTORE_R10 R10 = SAVE_R10;
-#else
-#define CALLER_SAVE_R10 /* nothing */
-#define CALLER_RESTORE_R10 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_F1
-#define CALLER_SAVE_F1 SAVE_F1 = F1;
-#define CALLER_RESTORE_F1 F1 = SAVE_F1;
-#else
-#define CALLER_SAVE_F1 /* nothing */
-#define CALLER_RESTORE_F1 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_F2
-#define CALLER_SAVE_F2 SAVE_F2 = F2;
-#define CALLER_RESTORE_F2 F2 = SAVE_F2;
-#else
-#define CALLER_SAVE_F2 /* nothing */
-#define CALLER_RESTORE_F2 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_F3
-#define CALLER_SAVE_F3 SAVE_F3 = F3;
-#define CALLER_RESTORE_F3 F3 = SAVE_F3;
-#else
-#define CALLER_SAVE_F3 /* nothing */
-#define CALLER_RESTORE_F3 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_F4
-#define CALLER_SAVE_F4 SAVE_F4 = F4;
-#define CALLER_RESTORE_F4 F4 = SAVE_F4;
-#else
-#define CALLER_SAVE_F4 /* nothing */
-#define CALLER_RESTORE_F4 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_D1
-#define CALLER_SAVE_D1 SAVE_D1 = D1;
-#define CALLER_RESTORE_D1 D1 = SAVE_D1;
-#else
-#define CALLER_SAVE_D1 /* nothing */
-#define CALLER_RESTORE_D1 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_D2
-#define CALLER_SAVE_D2 SAVE_D2 = D2;
-#define CALLER_RESTORE_D2 D2 = SAVE_D2;
-#else
-#define CALLER_SAVE_D2 /* nothing */
-#define CALLER_RESTORE_D2 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_L1
-#define CALLER_SAVE_L1 SAVE_L1 = L1;
-#define CALLER_RESTORE_L1 L1 = SAVE_L1;
-#else
-#define CALLER_SAVE_L1 /* nothing */
-#define CALLER_RESTORE_L1 /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_Sp
-#define CALLER_SAVE_Sp SAVE_Sp = Sp;
-#define CALLER_RESTORE_Sp Sp = SAVE_Sp;
-#else
-#define CALLER_SAVE_Sp /* nothing */
-#define CALLER_RESTORE_Sp /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_SpLim
-#define CALLER_SAVE_SpLim SAVE_SpLim = SpLim;
-#define CALLER_RESTORE_SpLim SpLim = SAVE_SpLim;
-#else
-#define CALLER_SAVE_SpLim /* nothing */
-#define CALLER_RESTORE_SpLim /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_Hp
-#define CALLER_SAVE_Hp SAVE_Hp = Hp;
-#define CALLER_RESTORE_Hp Hp = SAVE_Hp;
-#else
-#define CALLER_SAVE_Hp /* nothing */
-#define CALLER_RESTORE_Hp /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_Base
-#ifdef THREADED_RTS
-#error "Can't have caller-saved BaseReg with THREADED_RTS"
-#endif
-#define CALLER_SAVE_Base /* nothing */
-#define CALLER_RESTORE_Base BaseReg = &MainRegTable;
-#else
-#define CALLER_SAVE_Base /* nothing */
-#define CALLER_RESTORE_Base /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_CurrentTSO
-#define CALLER_SAVE_CurrentTSO SAVE_CurrentTSO = CurrentTSO;
-#define CALLER_RESTORE_CurrentTSO CurrentTSO = SAVE_CurrentTSO;
-#else
-#define CALLER_SAVE_CurrentTSO /* nothing */
-#define CALLER_RESTORE_CurrentTSO /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_CurrentNursery
-#define CALLER_SAVE_CurrentNursery SAVE_CurrentNursery = CurrentNursery;
-#define CALLER_RESTORE_CurrentNursery CurrentNursery = SAVE_CurrentNursery;
-#else
-#define CALLER_SAVE_CurrentNursery /* nothing */
-#define CALLER_RESTORE_CurrentNursery /* nothing */
-#endif
-
-#ifdef CALLER_SAVES_HpAlloc
-#define CALLER_SAVE_HpAlloc SAVE_HpAlloc = HpAlloc;
-#define CALLER_RESTORE_HpAlloc HpAlloc = SAVE_HpAlloc;
-#else
-#define CALLER_SAVE_HpAlloc /* nothing */
-#define CALLER_RESTORE_HpAlloc /* nothing */
-#endif
-
#endif /* IN_STG_CODE */
-/* ----------------------------------------------------------------------------
- Handy bunches of saves/restores
- ------------------------------------------------------------------------ */
-
-#if IN_STG_CODE
-
-#define CALLER_SAVE_USER \
- CALLER_SAVE_R1 \
- CALLER_SAVE_R2 \
- CALLER_SAVE_R3 \
- CALLER_SAVE_R4 \
- CALLER_SAVE_R5 \
- CALLER_SAVE_R6 \
- CALLER_SAVE_R7 \
- CALLER_SAVE_R8 \
- CALLER_SAVE_R9 \
- CALLER_SAVE_R10 \
- CALLER_SAVE_F1 \
- CALLER_SAVE_F2 \
- CALLER_SAVE_F3 \
- CALLER_SAVE_F4 \
- CALLER_SAVE_D1 \
- CALLER_SAVE_D2 \
- CALLER_SAVE_L1
-
- /* Save Base last, since the others may
- be addressed relative to it */
-#define CALLER_SAVE_SYSTEM \
- CALLER_SAVE_Sp \
- CALLER_SAVE_SpLim \
- CALLER_SAVE_Hp \
- CALLER_SAVE_CurrentTSO \
- CALLER_SAVE_CurrentNursery \
- CALLER_SAVE_Base
-
-#define CALLER_RESTORE_USER \
- CALLER_RESTORE_R1 \
- CALLER_RESTORE_R2 \
- CALLER_RESTORE_R3 \
- CALLER_RESTORE_R4 \
- CALLER_RESTORE_R5 \
- CALLER_RESTORE_R6 \
- CALLER_RESTORE_R7 \
- CALLER_RESTORE_R8 \
- CALLER_RESTORE_R9 \
- CALLER_RESTORE_R10 \
- CALLER_RESTORE_F1 \
- CALLER_RESTORE_F2 \
- CALLER_RESTORE_F3 \
- CALLER_RESTORE_F4 \
- CALLER_RESTORE_D1 \
- CALLER_RESTORE_D2 \
- CALLER_RESTORE_L1
-
- /* Restore Base first, since the others may
- be addressed relative to it */
-#define CALLER_RESTORE_SYSTEM \
- CALLER_RESTORE_Base \
- CALLER_RESTORE_Sp \
- CALLER_RESTORE_SpLim \
- CALLER_RESTORE_Hp \
- CALLER_RESTORE_CurrentTSO \
- CALLER_RESTORE_CurrentNursery
-
-#else /* not IN_STG_CODE */
-
-#define CALLER_SAVE_USER /* nothing */
-#define CALLER_SAVE_SYSTEM /* nothing */
-#define CALLER_RESTORE_USER /* nothing */
-#define CALLER_RESTORE_SYSTEM /* nothing */
-
-#endif /* IN_STG_CODE */
-#define CALLER_SAVE_ALL \
- CALLER_SAVE_SYSTEM \
- CALLER_SAVE_USER
-
-#define CALLER_RESTORE_ALL \
- CALLER_RESTORE_SYSTEM \
- CALLER_RESTORE_USER
-
#endif /* REGS_H */