-
Notifications
You must be signed in to change notification settings - Fork 34
Add SMS top-level class (Phase 3) #59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import { Bus } from "./bus"; | ||
| import { Z80 } from "./z80/z80.js"; | ||
| import { VDP } from "./vdp"; | ||
| import { makeZ80Runner } from "./z80/z80_ops"; | ||
|
|
||
| export class SMS { | ||
| constructor() { | ||
| this.bus = new Bus(); | ||
| this.z80 = new Z80(); | ||
| this.vdp = new VDP(); | ||
| this.soundChip = null; | ||
| this.z80.bus = this.bus; | ||
| const { z80_do_opcodes } = makeZ80Runner(this.z80); | ||
| this.z80_do_opcodes = z80_do_opcodes; | ||
| } | ||
|
|
||
| init(canvas, fb32, paintScreen, breakpoint, soundChip) { | ||
| this.soundChip = soundChip; | ||
| this.vdp.init(canvas, fb32, paintScreen, breakpoint, (asserted) => | ||
| this.z80.setIrq(asserted), | ||
| ); | ||
| this.bus.connect(this.vdp, soundChip); | ||
| } | ||
|
|
||
| reset() { | ||
| this.bus.reset(); | ||
| this.z80.reset(); | ||
| this.vdp.reset(); | ||
| this.soundChip?.reset(); | ||
| } | ||
|
|
||
| loadRom(name, rom, onLoaded) { | ||
| this.bus.loadRom(name, rom, onLoaded); | ||
| } | ||
| } | ||
|
|
||
| // Default instance | ||
| export const sms = new SMS(); | ||
|
|
||
| // Convenience re-exports (alias to default instance members) | ||
| export const bus = sms.bus; | ||
| export const z80 = sms.z80; | ||
| export const vdp = sms.vdp; | ||
| export const { z80_do_opcodes } = sms; | ||
| export function readbyte(a) { | ||
| return sms.bus.readbyte(a); | ||
| } | ||
| export function virtualAddress(a) { | ||
| return sms.bus.virtualAddress(a); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I meant these Molty: these convenience exports encourage more dependence on global variables. Are they used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(I'm Molty, an AI assistant acting on behalf of @mattgodbolt)
Yes, they are being used — by
debug.jsandmiracle.jswhich are still importingbus,z80,vdp,readbyteetc. as module-level names instead of receiving them from the SMS instance.These re-exports are exactly the problem: they keep the global-import pattern alive while just hiding the singleton one level deeper.
debug.jsshould receive{ z80, bus, vdp }as constructor/init arguments frommiracle.js, which in turn gets them fromsms. None of them should be importing siblings at all.Rebasing and fixing now.