summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakenobu Tani <takenobu.hs@gmail.com>2020-04-18 12:38:54 +0900
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-04-22 23:09:50 -0400
commitffd7eef22f197ba44f0ced97ebc988f2d7d643a4 (patch)
tree982599bd1bce7d01953249b0761e24cc2fb05f99
parent747093b7c23a1cf92b564eb3d9efe2adc15330df (diff)
downloadhaskell-ffd7eef22f197ba44f0ced97ebc988f2d7d643a4.tar.gz
stg-spec: Modify file paths according to new module hierarchy
This patch updates file paths according to new module hierarchy [1]: * GHC/Stg/Syntax.hs <= stgSyn/StgSyn.hs * GHC/Types/Literal.hs <= basicTypes/Literal.hs * GHC/Types/CostCentre.hs <= profiling/CostCentre.hs This patch also updates old file path [2]: * utils/genapply/Main.hs <= utils/genapply/GenApply.hs [1]: https://gitlab.haskell.org/ghc/ghc/-/wikis/Make-GHC-codebase-more-modular [2]: commit 0cc4aad36f [skip ci]
-rw-r--r--docs/stg-spec/StgSyn.ott20
-rw-r--r--docs/stg-spec/stg-spec.mng2
2 files changed, 11 insertions, 11 deletions
diff --git a/docs/stg-spec/StgSyn.ott b/docs/stg-spec/StgSyn.ott
index 5d80485374..2be449a94c 100644
--- a/docs/stg-spec/StgSyn.ott
+++ b/docs/stg-spec/StgSyn.ott
@@ -28,13 +28,13 @@ indexvar i, j, k, n ::= {{ com Indices to be used in lists }}
grammar
lit {{ tex \textsf{lit} }} :: 'Literal_' ::=
- {{ com Literals, \coderef{basicTypes/Literal.hs}{Literal} }}
+ {{ com Literals, \coderef{GHC/Types/Literal.hs}{Literal} }}
op {{ tex \textsf{op} }} :: 'StgOp_' ::=
- {{ com Primitive operation or foreign call, \coderef{stgSyn/StgSyn.hs}{StgOp} }}
+ {{ com Primitive operation or foreign call, \coderef{GHC/Stg/Syntax.hs}{StgOp} }}
cc {{ tex \textsf{cc} }} :: 'CostCentre_' ::=
- {{ com Cost-centre, \coderef{profiling/CostCentre.hs}{CostCentre} }}
+ {{ com Cost-centre, \coderef{GHC/Types/CostCentre.hs}{CostCentre} }}
ccs {{ tex \textsf{ccs} }} :: 'CostCentreStack_' ::=
| CCCS :: :: CurrentCCS {{ com Current cost-centre stack }}
@@ -42,9 +42,9 @@ ccs {{ tex \textsf{ccs} }} :: 'CostCentreStack_' ::=
| _ :: :: DontCareCCS {{ com Don't care cost-centre stack }}
| ccs ^ ccs' :: :: EnterFunCCS {{ com Function entry, \coderef{rts/Profiling.c}{enterFunCCS} }}
| ccs # cc :: :: PushCC {{ com Push a cost-centre, \coderef{rts/Profiling.c}{pushCostCentre} }}
- {{ com Cost-centre stack, \coderef{profiling/CostCentre.hs}{CostCentreStack} }}
+ {{ com Cost-centre stack, \coderef{GHC/Types/CostCentre.hs}{CostCentreStack} }}
-a, b, c :: 'StgArg_' ::= {{ com Arguments, \coderef{stgSyn/StgSyn.hs}{StgArg} }}
+a, b, c :: 'StgArg_' ::= {{ com Arguments, \coderef{GHC/Stg/Syntax.hs}{StgArg} }}
| x :: :: StgVarArg {{ com Variable }}
| lit :: :: StgLitArg {{ com Literal }}
@@ -59,7 +59,7 @@ xs :: 'Ids_' ::= {{ com List of variables }}
| nil :: :: EmptyList
| xs xs' :: :: Append
-e :: 'StgExpr_' ::= {{ com Expressions, \coderef{stgSyn/StgSyn.hs}{StgExpr} }}
+e :: 'StgExpr_' ::= {{ com Expressions, \coderef{GHC/Stg/Syntax.hs}{StgExpr} }}
| lit :: :: StgLit {{ com Literal }}
| x args :: :: StgApp {{ com Function application (or variable) }}
| K args :: :: StgConApp {{ com Saturated constructor application }}
@@ -75,23 +75,23 @@ subst :: 'Subst_' ::= {{ com List of substitutions }}
| [ a / x ] :: :: Mapping
| </ substi // i /> :: :: List
-binding :: 'StgBind_' ::= {{ com Let-bindings, \coderef{stgSyn/StgSyn.hs}{StgBind} }}
+binding :: 'StgBind_' ::= {{ com Let-bindings, \coderef{GHC/Stg/Syntax.hs}{StgBind} }}
| x = rhs :: :: StgNonRec {{ com Non-recursive binding }}
| rec </ xi = rhsi // and // i /> :: :: StgRec {{ com Recursive binding }}
-upd :: 'UpdateFlag_' ::= {{ com Update flag, \coderef{stgSyn/StgSyn.hs}{UpdateFlag} }}
+upd :: 'UpdateFlag_' ::= {{ com Update flag, \coderef{GHC/Stg/Syntax.hs}{UpdateFlag} }}
| r :: :: ReEntrant {{ com Function (re-entrant closure) }}
| u :: :: Updatable {{ com Thunk (updatable closure) }}
cl :: 'StgRhsClosure_' ::= {{ com StgRhsClosure }}
| \ upd ccs xs . e :: :: StgRhsClosure
-rhs :: 'StgRhs_' ::= {{ com Right-hand sides, \coderef{stgSyn/StgSyn.hs}{StgRhs} }}
+rhs :: 'StgRhs_' ::= {{ com Right-hand sides, \coderef{GHC/Stg/Syntax.hs}{StgRhs} }}
| cl :: :: StgRhsClosure {{ com Closure }}
| K ccs args :: :: StgRhsCon {{ com Constructor }}
| x :: :: StgRhsIndirection {{ com Indirection (runtime only) }}
-alt :: 'StgAlt_' ::= {{ com Case alternative, \coderef{stgSyn/StgSyn.hs}{StgAlt} }}
+alt :: 'StgAlt_' ::= {{ com Case alternative, \coderef{GHC/Stg/Syntax.hs}{StgAlt} }}
| K </ xi // i /> -> e :: :: StgAlt {{ com Constructor applied to fresh names }}
terminals :: 'terminals_' ::=
diff --git a/docs/stg-spec/stg-spec.mng b/docs/stg-spec/stg-spec.mng
index ea1b16746c..5c65aa53a4 100644
--- a/docs/stg-spec/stg-spec.mng
+++ b/docs/stg-spec/stg-spec.mng
@@ -172,7 +172,7 @@ The implementations of \textsc{App} rules are spread across two
different calling conventions for functions: slow calls and
direct calls. Direct calls handle saturated and over-applied
cases (\coderef{GHC/StgToCmm/Layout.hs}{slowArgs}), while slow
-calls handle all cases (\textit{utils/genapply/GenApply.hs});
+calls handle all cases (\textit{utils/genapply/Main.hs});
in particular, these cases ensure that the current cost-center
reverts to the one originally at the call site.
\item The \textsc{App} rule demonstrates that modern GHC