mirror of
https://github.com/trudnai/Steve2.git
synced 2025-01-31 10:29:56 +00:00
- Joystick On / Off from UI
- Aux Memory switches - Open any files using Open File Dialog
This commit is contained in:
tudnai
parent
2d58c13376
commit
697fc3171d
@ -22,7 +22,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
|
||||
@IBAction func Disk1_Selected(_ sender: NSMenuItem) {
|
||||
if let menuIdentifier = sender.identifier {
|
||||
woz_loadFile( Bundle.main.resourcePath, menuIdentifier.rawValue + ".woz" )
|
||||
woz_loadFile( Bundle.main.resourcePath! + "/" + menuIdentifier.rawValue + ".woz" )
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,6 +34,25 @@ class AppDelegate: NSObject, NSApplicationDelegate {
|
||||
// Insert code here to tear down your application
|
||||
}
|
||||
|
||||
@IBAction func selectAnImageFromFile(sender: AnyObject) {
|
||||
let openPanel = NSOpenPanel()
|
||||
openPanel.title = "Disk Image"
|
||||
openPanel.allowsMultipleSelection = false
|
||||
openPanel.canChooseDirectories = false
|
||||
openPanel.canCreateDirectories = false
|
||||
openPanel.canChooseFiles = true
|
||||
openPanel.allowedFileTypes = ["dsk","do","po","nib", "woz"]
|
||||
|
||||
openPanel.begin { (result) -> Void in
|
||||
if result == NSApplication.ModalResponse.OK {
|
||||
print("file:", openPanel.url!.path)
|
||||
//Do what you will
|
||||
//If there's only one URL, surely 'openPanel.URL'
|
||||
//but otherwise a for loop works
|
||||
woz_loadFile( openPanel.url?.path )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -639,6 +639,12 @@
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<menu key="submenu" title="Disk 1" id="lnc-y1-bUG">
|
||||
<items>
|
||||
<menuItem title="Open File" id="NHq-5y-OJe">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
<action selector="selectAnImageFromFileWithSender:" target="Voe-Tx-rLC" id="d7g-4U-neM"/>
|
||||
</connections>
|
||||
</menuItem>
|
||||
<menuItem title="Apple DOS 3.3 January 1983" identifier="Apple DOS 3.3 January 1983" id="KuV-6R-gyL">
|
||||
<modifierMask key="keyEquivalentModifierMask"/>
|
||||
<connections>
|
||||
@ -1058,10 +1064,46 @@
|
||||
</customSpacing>
|
||||
</stackView>
|
||||
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lVP-FP-u6x" userLabel="CPU Speed Selection">
|
||||
<rect key="frame" x="8" y="8" width="104" height="239"/>
|
||||
<rect key="frame" x="8" y="8" width="104" height="301"/>
|
||||
<subviews>
|
||||
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="7yw-J0-Fmj">
|
||||
<rect key="frame" x="0.0" y="298" width="96" height="5"/>
|
||||
</box>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e2E-di-h3i">
|
||||
<rect key="frame" x="-2" y="276" width="83" height="18"/>
|
||||
<buttonCell key="cell" type="check" title="KeybStick" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="UW9-Bt-pMv">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="Keyboard2JoystickOnOff:" target="XfG-lQ-9wD" id="8LD-mj-n5E"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wa3-TC-XUI">
|
||||
<rect key="frame" x="-2" y="254" width="79" height="18"/>
|
||||
<buttonCell key="cell" type="check" title="MouStick" bezelStyle="regularSquare" imagePosition="left" inset="2" id="BGz-fX-MyG">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="Mouse2JoystickOnOff:" target="XfG-lQ-9wD" id="ci4-xN-MVe"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xrz-jA-1Fh">
|
||||
<rect key="frame" x="-2" y="232" width="63" height="18"/>
|
||||
<buttonCell key="cell" type="check" title="Mouse" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1RG-zY-mD2">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="MouseOnOff:" target="XfG-lQ-9wD" id="h09-p3-mS4"/>
|
||||
</connections>
|
||||
</button>
|
||||
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="rIK-Xk-n9g">
|
||||
<rect key="frame" x="0.0" y="223" width="96" height="5"/>
|
||||
</box>
|
||||
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ccb-cj-gLu">
|
||||
<rect key="frame" x="-2" y="223" width="87" height="18"/>
|
||||
<rect key="frame" x="-2" y="201" width="87" height="18"/>
|
||||
<buttonCell key="cell" type="check" title="Quick Disk" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="6QV-uF-Gh7">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
@ -1070,8 +1112,11 @@
|
||||
<action selector="QuickDisk:" target="XfG-lQ-9wD" id="tt5-2M-B2Y"/>
|
||||
</connections>
|
||||
</button>
|
||||
<splitView dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ge3-qD-JO6">
|
||||
<rect key="frame" x="0.0" y="194" width="104" height="23"/>
|
||||
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="wih-Y6-2Bz">
|
||||
<rect key="frame" x="0.0" y="192" width="96" height="5"/>
|
||||
</box>
|
||||
<splitView hidden="YES" dividerStyle="thin" vertical="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ge3-qD-JO6">
|
||||
<rect key="frame" x="0.0" y="278" width="104" height="23"/>
|
||||
<subviews>
|
||||
<textField verticalHuggingPriority="750" fixedFrame="YES" id="SNE-lV-JXn" userLabel="SoundGap">
|
||||
<rect key="frame" x="0.0" y="0.0" width="90" height="23"/>
|
||||
@ -1197,6 +1242,12 @@
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
<integer value="1000"/>
|
||||
</visibilityPriorities>
|
||||
<customSpacing>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
@ -1209,6 +1260,12 @@
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
<real value="3.4028234663852886e+38"/>
|
||||
</customSpacing>
|
||||
</stackView>
|
||||
</subviews>
|
||||
|
||||
@ -53,6 +53,10 @@ class ViewController: NSViewController {
|
||||
@IBOutlet weak var hires: HiRes!
|
||||
@IBOutlet weak var splashScreen: NSImageView!
|
||||
|
||||
var Keyboard2Joystick = true
|
||||
var Mouse2Joystick = false
|
||||
var MouseInterface = true
|
||||
|
||||
|
||||
// static let charConvStr : String =
|
||||
// "@🄰🄱🄲🄳🄴🄵🄶🄷🄸🄹🄺🄻🄼🄽🄾🄿🅀🅁🅂🅃🅄🅅🅆🅇🅈🅉[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?" +
|
||||
@ -294,34 +298,41 @@ class ViewController: NSViewController {
|
||||
let keyCode = Int(event.keyCode)
|
||||
switch keyCode {
|
||||
case leftArrowKey:
|
||||
kbdInput(0x08)
|
||||
// setIO(0xC064, 0);
|
||||
print("LEFT", ddd);
|
||||
if ( Keyboard2Joystick ) {
|
||||
// Keyboard 2 JoyStick (Game Controller / Paddle)
|
||||
pdl_valarr[0] = 0
|
||||
}
|
||||
kbdInput(0x08)
|
||||
|
||||
// Keyboard 2 JoyStick (Game Controller / Paddle)
|
||||
pdl_valarr[0] = 0
|
||||
|
||||
case rightArrowKey:
|
||||
kbdInput(0x15)
|
||||
// setIO(0xC064, 255);
|
||||
print("RIGHT")
|
||||
// Keyboard 2 JoyStick (Game Controller / Paddle)
|
||||
pdl_valarr[0] = 1
|
||||
|
||||
if ( Keyboard2Joystick ) {
|
||||
pdl_valarr[0] = 1
|
||||
}
|
||||
kbdInput(0x15)
|
||||
|
||||
case downArrowKey:
|
||||
// kbdInput(0x0B)
|
||||
// setIO(0xC065, 255);
|
||||
print("DOWN")
|
||||
// Keyboard 2 JoyStick (Game Controller / Paddle)
|
||||
pdl_valarr[1] = 1
|
||||
|
||||
if ( Keyboard2Joystick ) {
|
||||
pdl_valarr[1] = 1
|
||||
}
|
||||
else {
|
||||
kbdInput(0x0B)
|
||||
}
|
||||
case upArrowKey:
|
||||
// kbdInput(0x0A)
|
||||
// setIO(0xC065, 0);
|
||||
print("UP")
|
||||
// Keyboard 2 JoyStick (Game Controller / Paddle)
|
||||
pdl_valarr[1] = 0
|
||||
|
||||
if ( Keyboard2Joystick ) {
|
||||
pdl_valarr[1] = 0
|
||||
}
|
||||
else {
|
||||
kbdInput(0x0A)
|
||||
}
|
||||
|
||||
default:
|
||||
// print("keycode: %d", keyCode)
|
||||
if let chars = event.characters {
|
||||
@ -677,14 +688,25 @@ class ViewController: NSViewController {
|
||||
// Mouse 2 JoyStick (Game Controller / Paddle)
|
||||
mouseLocation = view.window!.mouseLocationOutsideOfEventStream
|
||||
|
||||
pdl_prevarr[2] = pdl_valarr[2]
|
||||
pdl_valarr[2] = Double(mouseLocation.x / (displayField.frame.width) )
|
||||
pdl_diffarr[2] = pdl_valarr[2] - pdl_prevarr[2]
|
||||
|
||||
pdl_prevarr[3] = pdl_valarr[3]
|
||||
pdl_valarr[3] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
|
||||
pdl_diffarr[3] = pdl_valarr[3] - pdl_prevarr[3]
|
||||
if ( Mouse2Joystick ) {
|
||||
pdl_prevarr[0] = pdl_valarr[0]
|
||||
pdl_valarr[0] = Double(mouseLocation.x / (displayField.frame.width) )
|
||||
pdl_diffarr[0] = pdl_valarr[0] - pdl_prevarr[0]
|
||||
|
||||
pdl_prevarr[1] = pdl_valarr[1]
|
||||
pdl_valarr[1] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
|
||||
pdl_diffarr[1] = pdl_valarr[1] - pdl_prevarr[1]
|
||||
}
|
||||
|
||||
if ( MouseInterface ) {
|
||||
pdl_prevarr[2] = pdl_valarr[2]
|
||||
pdl_valarr[2] = Double(mouseLocation.x / (displayField.frame.width) )
|
||||
pdl_diffarr[2] = pdl_valarr[2] - pdl_prevarr[2]
|
||||
|
||||
pdl_prevarr[3] = pdl_valarr[3]
|
||||
pdl_valarr[3] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
|
||||
pdl_diffarr[3] = pdl_valarr[3] - pdl_prevarr[3]
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -717,7 +739,7 @@ class ViewController: NSViewController {
|
||||
|
||||
hires.clearScreen();
|
||||
|
||||
woz_loadFile( Bundle.main.resourcePath, "Apple DOS 3.3 January 1983.woz" )
|
||||
woz_loadFile( Bundle.main.resourcePath! + "/Apple DOS 3.3 January 1983.woz" )
|
||||
|
||||
//view.frame = CGRect(origin: CGPoint(), size: NSScreen.main!.visibleFrame.size)
|
||||
|
||||
@ -812,6 +834,18 @@ class ViewController: NSViewController {
|
||||
spkr_extra_buf = UInt32( sender.integerValue )
|
||||
}
|
||||
|
||||
@IBAction func Keyboard2JoystickOnOff(_ sender: NSButton) {
|
||||
Keyboard2Joystick = sender.state == .on
|
||||
}
|
||||
|
||||
@IBAction func Mouse2JoystickOnOff(_ sender: NSButton) {
|
||||
Mouse2Joystick = sender.state == .on
|
||||
}
|
||||
|
||||
@IBAction func MouseOnOff(_ sender: NSButton) {
|
||||
MouseInterface = sender.state == .on
|
||||
}
|
||||
|
||||
@IBAction func QuickDisk(_ sender: NSButton) {
|
||||
if sender.state == .on {
|
||||
diskAccelerator_speed = Int32( 25 * M / Double(fps) )
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include "common.h"
|
||||
#include "woz.h"
|
||||
|
||||
|
||||
extern const unsigned long long default_MHz_6502;
|
||||
@ -160,7 +161,6 @@ extern double mhz;
|
||||
#define fps 30U
|
||||
|
||||
extern void rom_loadFile( const char * bundlePath, const char * filename );
|
||||
extern void woz_loadFile( const char * bundlePath, const char * filename );
|
||||
extern void tst6502(void);
|
||||
extern void m6502_ColdReset( const char * bundlePath, const char * romFilePath );
|
||||
extern void m6502_Run(void);
|
||||
|
||||
@ -301,15 +301,15 @@ uint8_t woz_read() {
|
||||
}
|
||||
|
||||
|
||||
void woz_loadFile( const char * resourcePath, const char * filename ) {
|
||||
void woz_loadFile( const char * filename ) {
|
||||
|
||||
char fullpath[256];
|
||||
// char fullpath[256];
|
||||
//
|
||||
// strcpy(fullpath, resourcePath);
|
||||
// strcat(fullpath, "/");
|
||||
// strcat(fullpath, filename);
|
||||
|
||||
strcpy(fullpath, resourcePath);
|
||||
strcat(fullpath, "/");
|
||||
strcat(fullpath, filename);
|
||||
|
||||
FILE * f = fopen(fullpath, "rb");
|
||||
FILE * f = fopen(filename, "rb");
|
||||
if (f == NULL) {
|
||||
perror("Failed to read WOZ: ");
|
||||
return;
|
||||
|
||||
@ -120,7 +120,7 @@ extern uint8_t WOZlatch;
|
||||
|
||||
|
||||
extern uint8_t woz_read(void);
|
||||
extern void woz_loadFile( const char * bundlePath, const char * filename );
|
||||
extern void woz_loadFile( const char * filename );
|
||||
|
||||
|
||||
#endif /* woz_h */
|
||||
|
||||
@ -44,12 +44,16 @@ uint8_t * const RAM = Apple2_64K_RAM; // Pointer to the Main Memory so
|
||||
uint8_t * const MEM = Apple2_64K_MEM; // Pointer to the Shadow Memory Map so we can use this from Swift
|
||||
|
||||
uint8_t * const RDLOMEM = Apple2_64K_MEM; // for Read $0000 - $BFFF (shadow memory)
|
||||
uint8_t * const WRLOMEM = Apple2_64K_MEM; // for Write $0000 - $BFFF (shadow memory)
|
||||
uint8_t * WRLOMEM = Apple2_64K_MEM; // for Write $0000 - $BFFF (shadow memory)
|
||||
uint8_t * const RDHIMEM = Apple2_64K_MEM; // for Read / Write $0000 - $BFFF (shadow memory)
|
||||
uint8_t * WRD0MEM = Apple2_Dummy_RAM; // for writing $D000 - $DFFF
|
||||
uint8_t * WRHIMEM = Apple2_Dummy_RAM; // for writing $E000 - $FFFF
|
||||
|
||||
|
||||
MEMcfg_t MEMcfg = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
MEMcfg_t newMEMcfg = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
|
||||
|
||||
#define DEF_RAM_PAGE(mem,pg) \
|
||||
(mem) + ((pg) << 8)
|
||||
|
||||
@ -203,8 +207,6 @@ enum slot {
|
||||
};
|
||||
|
||||
|
||||
MEMcfg_t MEMcfg = { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
||||
|
||||
// https://www.kreativekorp.com/miscpages/a2info/iomemory.shtml
|
||||
// Comp: O = Apple II+ E = Apple IIe C = Apple IIc G = Apple IIgs
|
||||
// Act: R = Read W = Write 7 = Bit 7 V = Value
|
||||
@ -220,6 +222,7 @@ enum mmio {
|
||||
// Video
|
||||
io_80STOREOFF = 0xC000, // ECG W Use $C002-$C005 for Aux Memory
|
||||
io_80STOREON = 0xC001, // ECG W Use PAGE2 for Aux Memory
|
||||
|
||||
io_RD80STORE = 0xC018, // ECG R7 Status of $C002-$C005/PAGE2 for Aux Mem
|
||||
io_VID_CLR80VID = 0xC00C, // ECG W 40 Columns
|
||||
io_VID_SET80VID = 0xC00D, // ECG W 80 Columns
|
||||
@ -277,31 +280,37 @@ enum mmio {
|
||||
io_SETALTZP = 0xC009, // ECG W Aux Stack and Zero Page
|
||||
io_SETINTC3ROM = 0xC00A, // E G W ROM in Slot 3
|
||||
io_SETSLOTC3ROM = 0xC00B, // E G W ROM in Aux Slot
|
||||
|
||||
io_RDLCBNK2 = 0xC011, // ECG R7 Status of Selected $Dx Bank
|
||||
io_RDLCRAM = 0xC012, // ECG R7 Status of $Dx ROM / $Dx RAM (LC RAM)
|
||||
io_RDRAMRD = 0xC013, // ECG R7 Status of Main/Aux RAM Reading (auxilliary 48K)
|
||||
io_RDRAMWR = 0xC014, // ECG R7 Status of Main/Aux RAM Writing (auxilliary 48K)
|
||||
|
||||
io_RDCXROM = 0xC015, // E G R7 Read state of $C100-$CFFF soft switch -- Status of Periph/ROM Access
|
||||
io_RSTXINT = 0xC015, // C R Reset Mouse X0 Interrupt
|
||||
io_RDALTZP = 0xC016, // ECG R7 Status of Main/Aux Stack and Zero Page
|
||||
io_RDC3ROM = 0xC017, // E G R7 Status of Slot 3/Aux Slot ROM
|
||||
io_RSTYINT = 0xC017, // C R Reset Mouse Y0 Interrupt
|
||||
|
||||
io_MEM_RDRAM_NOWR_2 = 0xC080,
|
||||
io_MEM_RDROM_WRAM_2 = 0xC081,
|
||||
io_MEM_RDROM_NOWR_2 = 0xC082,
|
||||
io_MEM_RDRAM_WRAM_2 = 0xC083,
|
||||
io_MEM_RDRAM_NOWR_2 = 0xC080, // OECG WR Read RAM bank 2; no write
|
||||
io_MEM_RDROM_WRAM_2 = 0xC081, // OECG RR Read ROM; write RAM bank 2
|
||||
io_MEM_RDROM_NOWR_2 = 0xC082, // OECG WR Read ROM; no write
|
||||
io_MEM_RDRAM_WRAM_2 = 0xC083, // OECG RR Read/write RAM bank 2
|
||||
|
||||
io_MEM_RDRAM_NOWR_2_ = 0xC084,
|
||||
io_MEM_RDROM_WRAM_2_ = 0xC085,
|
||||
io_MEM_RDROM_NOWR_2_ = 0xC086,
|
||||
io_MEM_RDRAM_WRAM_2_ = 0xC087,
|
||||
io_MEM_RDRAM_NOWR_2_ = 0xC084, // OECG WR Read RAM bank 2; no write
|
||||
io_MEM_RDROM_WRAM_2_ = 0xC085, // OECG RR Read ROM; write RAM bank 2
|
||||
io_MEM_RDROM_NOWR_2_ = 0xC086, // OECG WR Read ROM; no write
|
||||
io_MEM_RDRAM_WRAM_2_ = 0xC087, // OECG RR Read/write RAM bank 2
|
||||
|
||||
io_MEM_RDRAM_NOWR_1 = 0xC088,
|
||||
io_MEM_RDROM_WRAM_1 = 0xC089,
|
||||
io_MEM_RDROM_NOWR_1 = 0xC08A,
|
||||
io_MEM_RDRAM_WRAM_1 = 0xC08B,
|
||||
io_MEM_RDRAM_NOWR_1 = 0xC088, // OECG WR Read RAM bank 1; no write
|
||||
io_MEM_RDROM_WRAM_1 = 0xC089, // OECG RR Read ROM; write RAM bank 1
|
||||
io_MEM_RDROM_NOWR_1 = 0xC08A, // OECG WR Read ROM; no write
|
||||
io_MEM_RDRAM_WRAM_1 = 0xC08B, // OECG RR Read/write RAM bank 1
|
||||
|
||||
io_MEM_RDRAM_NOWR_1_ = 0xC08C,
|
||||
io_MEM_RDROM_WRAM_1_ = 0xC08D,
|
||||
io_MEM_RDROM_NOWR_1_ = 0xC08E,
|
||||
io_MEM_RDRAM_WRAM_1_ = 0xC08F,
|
||||
io_MEM_RDRAM_NOWR_1_ = 0xC08C, // OECG WR Read RAM bank 1; no write
|
||||
io_MEM_RDROM_WRAM_1_ = 0xC08D, // OECG RR Read ROM; write RAM bank 1
|
||||
io_MEM_RDROM_NOWR_1_ = 0xC08E, // OECG WR Read ROM; no write
|
||||
io_MEM_RDRAM_WRAM_1_ = 0xC08F, // OECG RR Read/write RAM bank 1
|
||||
};
|
||||
|
||||
|
||||
@ -338,6 +347,8 @@ void resetMemory() {
|
||||
memset( Apple2_64K_MEM + 0x400, 0xA0, 0x800 );
|
||||
// I/O area should be 0 -- just in case we decide to init RAM with a different pattern...
|
||||
memset( Apple2_64K_RAM + 0xC000, 0, 0x1000 );
|
||||
|
||||
newMEMcfg = MEMcfg;
|
||||
}
|
||||
|
||||
|
||||
@ -370,43 +381,37 @@ void textPageSelect() {
|
||||
}
|
||||
|
||||
|
||||
void auxMemorySelect() {
|
||||
uint8_t * shadow = Apple2_64K_MEM + 0x200;
|
||||
uint8_t * memory;
|
||||
const uint8_t * const shadowLowMEM = Apple2_64K_MEM + 0x200;
|
||||
const uint8_t * currentLowMEM = Apple2_64K_RAM + 0x200;
|
||||
|
||||
if ( MEMcfg.is_80STORE ) {
|
||||
if ( MEMcfg.RD_AUX_MEM ) {
|
||||
memory = Apple2_64K_AUX + 0x200;
|
||||
|
||||
// save the content of Shadow Memory
|
||||
memcpy(Apple2_64K_RAM + 0x200, shadow, 0xA00);
|
||||
|
||||
// load the content of Aux Memory
|
||||
memcpy(Apple2_64K_MEM + 0x200, Apple2_64K_AUX, 0xA00);
|
||||
void auxMemorySelect( MEMcfg_t newMEMcfg ) {
|
||||
|
||||
// save the content of Shadow Memory
|
||||
memcpy( (void*) currentLowMEM, shadowLowMEM, 0xBE00);
|
||||
|
||||
if ( newMEMcfg.is_80STORE ) {
|
||||
if ( newMEMcfg.RD_AUX_MEM ) {
|
||||
currentLowMEM = Apple2_64K_AUX + 0x200;
|
||||
}
|
||||
else {
|
||||
memory = Apple2_64K_RAM + 0x200;
|
||||
|
||||
// save the content of Shadow Memory
|
||||
memcpy(Apple2_64K_AUX + 0x200, shadow, 0xA00);
|
||||
|
||||
// load the content of Int Memory
|
||||
memcpy(Apple2_64K_MEM + 0x200, Apple2_64K_RAM, 0xA00);
|
||||
currentLowMEM = Apple2_64K_RAM + 0x200;
|
||||
}
|
||||
|
||||
if ( MEMcfg.WR_AUX_MEM ) {
|
||||
// TODO: set write table for AUX
|
||||
WRLOMEM = Apple2_64K_AUX;
|
||||
}
|
||||
else {
|
||||
// TODO: set write table for RAM
|
||||
WRLOMEM = Apple2_64K_RAM;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// TODO: set read table for RAM
|
||||
WRLOMEM = Apple2_64K_RAM;
|
||||
}
|
||||
|
||||
// load new content to shadow memory
|
||||
memcpy(shadow, memory, 0xA00);
|
||||
memcpy( (void*) shadowLowMEM, currentLowMEM, 0xBE00);
|
||||
|
||||
MEMcfg = newMEMcfg;
|
||||
}
|
||||
|
||||
|
||||
@ -582,6 +587,18 @@ INLINE uint8_t ioRead( uint16_t addr ) {
|
||||
case (uint8_t)io_RDCXROM:
|
||||
return MEMcfg.int_Cx_ROM << 7;
|
||||
|
||||
case (uint8_t)io_RDLCBNK2:
|
||||
return MEMcfg.RAM_BANK_2 << 7;
|
||||
|
||||
case (uint8_t)io_RDLCRAM:
|
||||
return MEMcfg.RD_RAM << 7;
|
||||
|
||||
case (uint8_t)io_RDRAMRD:
|
||||
return MEMcfg.RD_AUX_MEM << 7;
|
||||
|
||||
case (uint8_t)io_RDRAMWR:
|
||||
return MEMcfg.WR_AUX_MEM << 7;
|
||||
|
||||
case (uint8_t)io_RDALTZP:
|
||||
return MEMcfg.ALT_ZP << 7;
|
||||
|
||||
@ -637,6 +654,34 @@ INLINE uint8_t ioRead( uint16_t addr ) {
|
||||
|
||||
case (uint8_t)io_PDL_STROBE:
|
||||
return pdl_reset();
|
||||
|
||||
case (uint8_t)io_RDMAINRAM:
|
||||
// printf("io_RDMAINRAM\n");
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.RD_AUX_MEM = 0;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_RDCARDRAM:
|
||||
// printf("io_RDCARDRAM\n");
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.RD_AUX_MEM = 1;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_WRMAINRAM:
|
||||
// printf("io_WRMAINRAM\n");
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.WR_AUX_MEM = 0;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_WRCARDRAM:
|
||||
// printf("io_WRCARDRAM\n");
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.WR_AUX_MEM = 1;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_MEM_RDRAM_NOWR_2:
|
||||
case (uint8_t)io_MEM_RDROM_WRAM_2:
|
||||
@ -763,7 +808,6 @@ void kbdUp () {
|
||||
}
|
||||
|
||||
|
||||
|
||||
INLINE void ioWrite( uint16_t addr, uint8_t val ) {
|
||||
// if (outdev) fprintf(outdev, "ioWrite:%04X (A:%02X)\n", addr, m6502.A);
|
||||
|
||||
@ -778,26 +822,30 @@ INLINE void ioWrite( uint16_t addr, uint8_t val ) {
|
||||
|
||||
case (uint8_t)io_RDMAINRAM:
|
||||
// printf("io_RDMAINRAM\n");
|
||||
MEMcfg.RD_AUX_MEM = 0;
|
||||
auxMemorySelect();
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.RD_AUX_MEM = 0;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_RDCARDRAM:
|
||||
// printf("io_RDCARDRAM\n");
|
||||
MEMcfg.RD_AUX_MEM = 1;
|
||||
auxMemorySelect();
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.RD_AUX_MEM = 1;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_WRMAINRAM:
|
||||
// printf("io_WRMAINRAM\n");
|
||||
MEMcfg.WR_AUX_MEM = 0;
|
||||
auxMemorySelect();
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.WR_AUX_MEM = 0;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_WRCARDRAM:
|
||||
// printf("io_WRCARDRAM\n");
|
||||
MEMcfg.WR_AUX_MEM = 1;
|
||||
auxMemorySelect();
|
||||
newMEMcfg = MEMcfg;
|
||||
newMEMcfg.WR_AUX_MEM = 1;
|
||||
auxMemorySelect(newMEMcfg);
|
||||
break;
|
||||
|
||||
case (uint8_t)io_SETSTDZP:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user