Hojun-Cho
7b6f24adea
The bare-`main` carve-out (which keeps the link entry's main unmangled) keyed on `leaf == "main" && imported == 0`. Under the combined path a dependency's body folds in with imported==1, so only the root's main stayed bare. Under separate compilation each package is its own unit and a dependency's body carries a path-mangling module-reset but imported==0 (#57) — so an imported `fn main` matched the carve-out, emitted a bare `TEXT main`, and collided with the root entry (`w6l: duplicate symbol main`). The combined path was unaffected, so this only surfaced under sep. Gate the carve-out with sep_isdep = (wwiout != NULL): the producer emits a .wwi output only for dependency units, never for the root/link-entry unit (root stripped, #69), symmetric on both stages. Only the root unit's main now stays bare; an imported package's main mangles on its import path (e.g. aa.bb.main). Both stages. Gate: test/wcc/989_depmain_sep.c (table-driven, dotted + single-component shapes, both stages; asserts the mangled dep main + a single bare root main + cs==ww byte-id; combined path stays neutral).
86 lines
2.8 KiB
C
86 lines
2.8 KiB
C
/*
|
|
* gc.h — w6c-private header: Prog/Adr structs, scratch register set,
|
|
* stack-frame state. Plan 9 cmd/6c/gc.h shape, trimmed.
|
|
*/
|
|
#ifndef SIX_GC_H
|
|
#define SIX_GC_H
|
|
|
|
#include "ww.h"
|
|
#include "6.out.h"
|
|
|
|
typedef struct Prog Prog;
|
|
typedef struct Adr Adr;
|
|
|
|
/* one operand: register, immediate, indirect, or symbolic. */
|
|
struct Adr {
|
|
int type; /* D_AX, D_CONST, D_INDIR, ... */
|
|
int reg; /* base register for D_INDIR */
|
|
long long offset; /* immediate value or memory displacement */
|
|
const char *sym; /* symbol name for D_EXTERN/D_BRANCH */
|
|
};
|
|
|
|
struct Prog {
|
|
int as; /* opcode (A_MOVQ, ...) */
|
|
Adr from; /* source operand */
|
|
Adr to; /* destination operand (Plan 9 order) */
|
|
int line;
|
|
const char *label; /* if non-NULL, this prog is preceded by label: */
|
|
Prog *link;
|
|
};
|
|
|
|
/* per-fn codegen state */
|
|
typedef struct Cg Cg;
|
|
struct Cg {
|
|
Arena *a;
|
|
Prog *head, *tail;
|
|
const char *fnname;
|
|
const char *cur_mod; /* current fn's `// MODULE: foo` directive,
|
|
* NULL when the fn lives in the primary
|
|
* file (no MODULE: stamp). Drives bare-IDENT
|
|
* call mangling — `frob()` from within
|
|
* lib/foo binds to `foo.frob` regardless
|
|
* of which other modules also export `frob`.
|
|
* Set by cgfn before walking the body. */
|
|
int framesize; /* bytes of locals; 16-byte aligned */
|
|
int curoff; /* current top of locals */
|
|
Scope *locals; /* (name → offset) tracked via Sym */
|
|
int labelseq;
|
|
int sep_mode; /* #22 M3 `-c`: separate-compile / primary-only
|
|
* codegen. Emit code+DATA ONLY for this
|
|
* package's own (imported==0) decls; treat every
|
|
* `.wwi`-sourced (imported==1) dep decl as an
|
|
* external — body-less fns already skip, value
|
|
* globals/defs are gated so they don't duplicate
|
|
* the dep's real definition (link collision).
|
|
* Off on the combined path (every existing
|
|
* invocation) so M3 is a pure addition. */
|
|
int sep_isdep; /* #99: this unit is a sep DEPENDENCY, not the
|
|
* root/link-entry unit. Set from `wwiout != NULL`
|
|
* in main: the producer passes -I (.wwi output)
|
|
* to DEP units only — the root's .wwi is stripped
|
|
* (#69), so wwiout==NULL <=> root/link-entry unit.
|
|
* Gates the bare-`main` carve-out: a dep's `fn
|
|
* main` must mangle on its path like any decl;
|
|
* only the root entry stays bare. */
|
|
};
|
|
|
|
/* cgen.c */
|
|
void cg_init(Cg*, Arena*);
|
|
void cg_file(Cg*, FILE *out, Node *file);
|
|
Prog *newprog(Cg*, int op);
|
|
void emit(Cg*, Prog*);
|
|
|
|
/* txt.c */
|
|
void txt_emit(FILE*, Prog *head);
|
|
|
|
/* wwi.c — `.wwi` export-data producer (w6c -I). M2 dead-code: writes a
|
|
* re-parseable ww-prototype rendering of the package's exported surface.
|
|
* Returns non-zero if check_exported_type rejects a dangling export. */
|
|
int wwi_emit(Checker *c, FILE *of, Node *file);
|
|
|
|
/* swt.c, peep.c, reg.c — placeholders for now */
|
|
void peephole(Cg*);
|
|
void regalloc_init(Cg*);
|
|
|
|
#endif
|