6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-06-01 20:41:36 +00:00
Code Issues Projects Releases Wiki Activity

ecs: Init, main_init, bss_init

Browse Source
This commit is contained in:
Steven Hugg 2022-02-06 11:47:51 -06:00
parent e3d54b9150
commit 109e60ae10
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/ecs/ecs.ts
View File

@ -244,24 +244,6 @@ export class Dialect_CA65 {
dey dey
bne :- bne :-
` `
HEADER = `
.include "vcs-ca65.h"
.define PAL 0
.code
`
FOOTER = `
.segment "VECTORS"
Return: .word $6060
VecNMI:
VecReset: .word Main::__Reset
VecBRK: .word Main::__BRK
`
TEMPLATE_INIT_MAIN = `
__NMI:
__Reset:
__BRK:
CLEAN_START
`
comment(s: string) { comment(s: string) {
return `\n;;; ${s}\n`; return `\n;;; ${s}\n`;
@ -688,6 +670,9 @@ class ActionEval {
return `${this.tmplabel}+${tempinc}`; return `${this.tmplabel}+${tempinc}`;
//return `TEMP+${this.scope.tempOffset}+${tempinc}`; //return `TEMP+${this.scope.tempOffset}+${tempinc}`;
} }
__bss_init(args: string[]) {
return this.scope.allocateInitData(this.scope.bss);
}
wrapCodeInLoop(code: string, action: Action, ents: Entity[], joinfield?: ComponentFieldPair): string { wrapCodeInLoop(code: string, action: Action, ents: Entity[], joinfield?: ComponentFieldPair): string {
// TODO: check ents // TODO: check ents
// TODO: check segment bounds // TODO: check segment bounds
@ -1106,14 +1091,15 @@ export class EntityScope implements SourceLocated {
this.allocateROData(this.rodata); this.allocateROData(this.rodata);
} }
generateCode() { generateCode() {
let isMainScope = this.parent == null;
this.tempOffset = this.maxTempBytes = 0; this.tempOffset = this.maxTempBytes = 0;
// TODO: main scope? let start;
if (this.name.toLowerCase() == 'main') { if (isMainScope) {
this.code.addCodeFragment(this.dialect.TEMPLATE_INIT_MAIN); this.addUsingSystem(this.em.getSystemByName('Init')); //TODO: what if none?
start = this.generateCodeForEvent('main_init');
} else {
start = this.generateCodeForEvent('start');
} }
let initcode = this.allocateInitData(this.bss);
this.code.addCodeFragment(initcode);
let start = this.generateCodeForEvent('start');
this.code.addCodeFragment(start); this.code.addCodeFragment(start);
for (let sub of Array.from(this.resources.values())) { for (let sub of Array.from(this.resources.values())) {
let code = this.generateCodeForEvent(sub); let code = this.generateCodeForEvent(sub);
@ -1123,6 +1109,9 @@ export class EntityScope implements SourceLocated {
dump(file: SourceFileExport) { dump(file: SourceFileExport) {
this.analyzeEntities(); this.analyzeEntities();
this.generateCode(); this.generateCode();
this.dumpCodeTo(file);
}
private dumpCodeTo(file: SourceFileExport) {
let dialect = this.dialect; let dialect = this.dialect;
file.line(dialect.startScope(this.name)); file.line(dialect.startScope(this.name));
file.line(dialect.segment(`${this.name}_DATA`, 'bss')); file.line(dialect.segment(`${this.name}_DATA`, 'bss'));
@ -1250,12 +1239,10 @@ export class EntityManager {
}) })
} }
exportToFile(file: SourceFileExport) { exportToFile(file: SourceFileExport) {
file.text(this.dialect.HEADER); // TODO
for (let scope of Object.values(this.topScopes)) { for (let scope of Object.values(this.topScopes)) {
if (!scope.isDemo || scope.filePath == this.mainPath) { if (!scope.isDemo || scope.filePath == this.mainPath) {
scope.dump(file); scope.dump(file);
} }
} }
file.text(this.dialect.FOOTER); // TODO
} }
} }

2
src/test/testecs.ts
View File

@ -370,8 +370,6 @@ describe('Compiler', function() {
let files = readdirSync(testdir).filter(f => f.endsWith('.ecs')); let files = readdirSync(testdir).filter(f => f.endsWith('.ecs'));
files.forEach((ecspath) => { files.forEach((ecspath) => {
let dialect = new Dialect_CA65(); let dialect = new Dialect_CA65();
dialect.HEADER = '';
dialect.FOOTER = '';
let em = new EntityManager(dialect); let em = new EntityManager(dialect);
let compiler = new ECSCompiler(em); let compiler = new ECSCompiler(em);
let code = readFileSync(testdir + ecspath, 'utf-8'); let code = readFileSync(testdir + ecspath, 'utf-8');