Code separation, clocks ticks counts, bugfixes

This commit is contained in:
Tamas Rudnai 2019-07-30 01:05:21 -07:00
parent 75a844161d
commit 115313a40f
25 changed files with 3743 additions and 7 deletions

View File

@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
32439F8722ECD8AD0077AAE0 /* 6502.c in Sources */ = {isa = PBXBuildFile; fileRef = 32439F7422ECD8AD0077AAE0 /* 6502.c */; };
32439F8822ECD8AD0077AAE0 /* apple.rom in Resources */ = {isa = PBXBuildFile; fileRef = 32439F8422ECD8AD0077AAE0 /* apple.rom */; };
32BFFB5B22EACC630003B53F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32BFFB5A22EACC630003B53F /* AppDelegate.swift */; };
32BFFB5D22EACC630003B53F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32BFFB5C22EACC630003B53F /* ViewController.swift */; };
32BFFB5F22EACC660003B53F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 32BFFB5E22EACC660003B53F /* Assets.xcassets */; };
@ -33,6 +35,26 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
32439F7222ECD8AC0077AAE0 /* A2Mac-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "A2Mac-Bridging-Header.h"; sourceTree = "<group>"; };
32439F7322ECD8AD0077AAE0 /* Apple2_mmio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Apple2_mmio.h; sourceTree = "<group>"; };
32439F7422ECD8AD0077AAE0 /* 6502.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 6502.c; sourceTree = "<group>"; };
32439F7622ECD8AD0077AAE0 /* 6502_instr_set_clr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_set_clr.h; sourceTree = "<group>"; };
32439F7722ECD8AD0077AAE0 /* 6502_instr_stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_stack.h; sourceTree = "<group>"; };
32439F7822ECD8AD0077AAE0 /* 6502_instr_logic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_logic.h; sourceTree = "<group>"; };
32439F7922ECD8AD0077AAE0 /* 6502_instr_shift_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_shift_rotate.h; sourceTree = "<group>"; };
32439F7A22ECD8AD0077AAE0 /* 6502_instr_inc_dec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_inc_dec.h; sourceTree = "<group>"; };
32439F7B22ECD8AD0077AAE0 /* 6502_instr_compare_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_compare_test.h; sourceTree = "<group>"; };
32439F7C22ECD8AD0077AAE0 /* 6502_instr_branch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_branch.h; sourceTree = "<group>"; };
32439F7D22ECD8AD0077AAE0 /* 6502_instr_misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_misc.h; sourceTree = "<group>"; };
32439F7E22ECD8AD0077AAE0 /* 6502_instr_arithmetic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_arithmetic.h; sourceTree = "<group>"; };
32439F7F22ECD8AD0077AAE0 /* 6502_instr_transfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_transfer.h; sourceTree = "<group>"; };
32439F8022ECD8AD0077AAE0 /* 6502_instr_load_store.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_load_store.h; sourceTree = "<group>"; };
32439F8122ECD8AD0077AAE0 /* 6502_instr_BACKUP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_BACKUP.h; sourceTree = "<group>"; };
32439F8222ECD8AD0077AAE0 /* 6502_instr_call_ret_jump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instr_call_ret_jump.h; sourceTree = "<group>"; };
32439F8322ECD8AD0077AAE0 /* 6502_instructions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502_instructions.h; sourceTree = "<group>"; };
32439F8422ECD8AD0077AAE0 /* apple.rom */ = {isa = PBXFileReference; lastKnownFileType = file; path = apple.rom; sourceTree = "<group>"; };
32439F8522ECD8AD0077AAE0 /* 6502.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 6502.h; sourceTree = "<group>"; };
32439F8622ECD8AD0077AAE0 /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
32BFFB5722EACC630003B53F /* A2Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = A2Mac.app; sourceTree = BUILT_PRODUCTS_DIR; };
32BFFB5A22EACC630003B53F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
32BFFB5C22EACC630003B53F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@ -73,6 +95,27 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
32439F7522ECD8AD0077AAE0 /* instructions */ = {
isa = PBXGroup;
children = (
32439F8022ECD8AD0077AAE0 /* 6502_instr_load_store.h */,
32439F7622ECD8AD0077AAE0 /* 6502_instr_set_clr.h */,
32439F7722ECD8AD0077AAE0 /* 6502_instr_stack.h */,
32439F7822ECD8AD0077AAE0 /* 6502_instr_logic.h */,
32439F7922ECD8AD0077AAE0 /* 6502_instr_shift_rotate.h */,
32439F7A22ECD8AD0077AAE0 /* 6502_instr_inc_dec.h */,
32439F7B22ECD8AD0077AAE0 /* 6502_instr_compare_test.h */,
32439F7C22ECD8AD0077AAE0 /* 6502_instr_branch.h */,
32439F7D22ECD8AD0077AAE0 /* 6502_instr_misc.h */,
32439F7E22ECD8AD0077AAE0 /* 6502_instr_arithmetic.h */,
32439F7F22ECD8AD0077AAE0 /* 6502_instr_transfer.h */,
32439F8122ECD8AD0077AAE0 /* 6502_instr_BACKUP.h */,
32439F8222ECD8AD0077AAE0 /* 6502_instr_call_ret_jump.h */,
32439F8322ECD8AD0077AAE0 /* 6502_instructions.h */,
);
path = instructions;
sourceTree = "<group>";
};
32BFFB4E22EACC630003B53F = {
isa = PBXGroup;
children = (
@ -96,12 +139,19 @@
32BFFB5922EACC630003B53F /* A2Mac */ = {
isa = PBXGroup;
children = (
32439F7522ECD8AD0077AAE0 /* instructions */,
32439F7422ECD8AD0077AAE0 /* 6502.c */,
32439F8522ECD8AD0077AAE0 /* 6502.h */,
32439F8422ECD8AD0077AAE0 /* apple.rom */,
32439F7322ECD8AD0077AAE0 /* Apple2_mmio.h */,
32439F8622ECD8AD0077AAE0 /* common.h */,
32BFFB5A22EACC630003B53F /* AppDelegate.swift */,
32BFFB5C22EACC630003B53F /* ViewController.swift */,
32BFFB5E22EACC660003B53F /* Assets.xcassets */,
32BFFB6022EACC660003B53F /* Main.storyboard */,
32BFFB6322EACC660003B53F /* Info.plist */,
32BFFB6422EACC660003B53F /* A2Mac.entitlements */,
32439F7222ECD8AC0077AAE0 /* A2Mac-Bridging-Header.h */,
);
path = A2Mac;
sourceTree = "<group>";
@ -192,6 +242,7 @@
TargetAttributes = {
32BFFB5622EACC630003B53F = {
CreatedOnToolsVersion = 10.2.1;
LastSwiftMigration = 1020;
};
32BFFB6822EACC660003B53F = {
CreatedOnToolsVersion = 10.2.1;
@ -229,6 +280,7 @@
buildActionMask = 2147483647;
files = (
32BFFB5F22EACC660003B53F /* Assets.xcassets in Resources */,
32439F8822ECD8AD0077AAE0 /* apple.rom in Resources */,
32BFFB6222EACC660003B53F /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -254,6 +306,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
32439F8722ECD8AD0077AAE0 /* 6502.c in Sources */,
32BFFB5D22EACC630003B53F /* ViewController.swift in Sources */,
32BFFB5B22EACC630003B53F /* AppDelegate.swift in Sources */,
);
@ -421,6 +474,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = A2Mac/A2Mac.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
@ -432,6 +486,8 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2Mac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "A2Mac/A2Mac-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
@ -440,6 +496,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = A2Mac/A2Mac.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
@ -451,6 +508,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.gamealloy.A2Mac;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "A2Mac/A2Mac-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
name = Release;

View File

@ -10,5 +10,23 @@
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>32BFFB5622EACC630003B53F</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32BFFB6822EACC660003B53F</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>32BFFB7322EACC660003B53F</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>

501
A2Mac/6502.c Normal file
View File

@ -0,0 +1,501 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include "common.h"
#include "Apple2_mmio.h"
/**
Instruction Implementations
!!!! `his has to be here!!!
This idea is that "static inline" would work only if it is
located in the same source file -- hence the include...
**/
#include "6502_instructions.h"
/////
unsigned long long int clktime = 0;
m6502_s m6502 = {0};
static inline int m6502_step() {
switch ( fetch() ) {
case 0x00: BRK(); return 2; // BRK
case 0x01: ORA( memread( addr_X_ind() ) ); return 6; // ORA X,ind
// case 0x02: // t jams
// case 0x03: // SLO* (undocumented)
// case 0x04: // NOP* (undocumented)
case 0x05: ORA( memread( fetch() ) ); return 3; // ORA zpg
case 0x06: ASL( & RAM[ fetch() ] ); return 5; // ASL zpg
// case 0x07: // SLO* (undocumented)
case 0x08: PHP(); return 3; // PHP
case 0x09: ORA( fetch() ); return 2; // ORA imm
case 0x0A: ASL( & m6502.A ); return 2; // ASL A
// case 0x0B: // ANC** (undocumented)
// case 0x0C: // NOP* (undocumented)
case 0x0D: ORA( memread( fetch16() ) ); return 4; // ORA abs
case 0x0E: ASL( & RAM[ fetch16() ] ); return 6; // ASL abs
// case 0x0F: // SLO* (undocumented)
case 0x10: BPL( (int8_t)fetch() ); return 2; // BPL rel
case 0x11: ORA( memread( addr_ind_Y() ) ); return 5; // ORA ind,Y
// case 0x12: // t jams
// case 0x13: // SLO* (undocumented)
// case 0x14: // NOP* (undocumented)
case 0x15: ORA( memread( fetch() + m6502.X ) ); return 4; // ORA zpg,X
case 0x16: ASL( & RAM[ fetch() + m6502.X ] ); return 6; // ASL zpg,X
// case 0x17: // SLO* (undocumented)
case 0x18: CLC(); return 2; // CLC
case 0x19: ORA( memread( fetch16() + m6502.Y ) ); return 4; // ORA abs,Y
// case 0x1A: // NOP* (undocumented)
// case 0x1B: // SLO* (undocumented)
// case 0x1C: // NOP* (undocumented)
case 0x1D: ORA( memread( fetch16() + m6502.X ) ); return 4; // ORA abs,X
case 0x1E: ASL( & RAM[ fetch16() + m6502.X ] ); return 7; // ASL abs,X
// case 0x1F: // SLO* (undocumented)
case 0x20: JSR( fetch16() ); return 6; // JSR abs
case 0x21: AND( memread( addr_X_ind() ) ); return 6; // AND X,ind
// case 0x22:
// case 0x23:
case 0x24: BIT( memread( fetch() ) ); return 3; // BIT zpg
case 0x25: AND( memread( fetch() ) ); return 3; // AND zpg
case 0x26: ROL( & RAM[ fetch() ] ); return 5; // ROL zpg
// case 0x27:
case 0x28: PLP(); return 4; // PLP
case 0x29: AND( fetch() ); return 2; // AND imm
case 0x2A: ROL( & m6502.A ); return 2; // ROL A
// case 0x2B:
case 0x2C: BIT( memread( fetch16() ) ); return 4; // BIT abs
case 0x2D: AND( fetch16() ); return 4; // AND abs
case 0x2E: ROL( & RAM[ fetch16() ] ); return 6; // ROL abs
// case 0x2F:
case 0x30: BMI( (int8_t)fetch() ); return 2; // BMI rel
case 0x31: AND( memread( addr_ind_Y() ) ); return 5; // AND ind,Y
// case 0x32:
// case 0x33:
// case 0x34:
case 0x35: AND( memread( addr_zpg_X() ) ); return 4; // AND zpg,X
case 0x36: ROL( & RAM[ addr_zpg_X() ] ); return 6; // ROL zpg,X
// case 0x37:
case 0x38: SEC(); return 2; // SEC
case 0x39: AND( memread( addr_abs_Y() ) ); return 4; // AND abs,Y
// case 0x3A:
// case 0x3B:
// case 0x3C:
case 0x3D: AND( memread( addr_abs_X() ) ); return 4; // AND abs,X
case 0x3E: ROL( & RAM[ addr_abs_X() ] ); return 7; // ROL abs,X
// case 0x3F:
case 0x40: RTI(); return 6; // RTI
case 0x41: EOR( memread( addr_X_ind() ) ); return 6; // EOR X,ind
// case 0x42:
// case 0x43:
// case 0x44:
case 0x45: EOR( memread( fetch() ) ); return 3; // EOR zpg
case 0x46: LSR( & RAM[ fetch() ] ); return 5; // LSR zpg
// case 0x47:
case 0x48: PHA(); return 3; // PHA
case 0x49: EOR( fetch() ); return 2; // EOR imm
case 0x4A: LSR( & m6502.A ); return 2; // LSR A
// case 0x4B:
case 0x4C: JMP( fetch16() ); return 3; // JMP abs
case 0x4D: EOR( fetch16() ); return 4; // EOR abs
case 0x4E: LSR( & RAM[ fetch16() ] ); return 6; // LSR abs
// case 0x4F:
case 0x50: BVC( (int8_t)fetch() ); return 2; // BVC rel
case 0x51: EOR( memread( addr_ind_Y() ) ); return 5; // EOR ind,Y
// case 0x52:
// case 0x53:
// case 0x54:
case 0x55: EOR( memread( addr_zpg_X() ) ); return 4; // AND zpg,X
case 0x56: LSR( & RAM[ addr_zpg_X() ] ); return 6; // LSR zpg,X
// case 0x57:
case 0x58: CLI(); return 2; // CLI
case 0x59: EOR( memread( addr_abs_Y() ) ); return 4; // EOR abs,Y
// case 0x5A:
// case 0x5B:
// case 0x5C:
case 0x5D: EOR( memread( addr_abs_X() ) ); return 4; // EOR abs,X
case 0x5E: LSR( & RAM[ addr_abs_X() ] ); return 7; // LSR abs,X
// case 0x5F:
case 0x60: RTS(); return 6; // RTS
case 0x61: ADC( memread( addr_X_ind() ) ); return 6; // ADC X,ind
// case 0x62:
// case 0x63:
// case 0x64:
case 0x65: ADC( memread( fetch() ) ); return 3; // ADC zpg
case 0x66: ROR( & RAM[ fetch() ] ); return 5; // ROR zpg
// case 0x67:
case 0x68: PLA(); break; // PLA
case 0x69: ADC( fetch() ); return 2; // ADC imm
case 0x6A: ROR( & m6502.A ); return 2; // ROR A
// case 0x6B:
case 0x6C: JMP( memread16( fetch16() ) ); return 5; // JMP ind
case 0x6D: ADC( memread( fetch16() ) ); return 4; // ADC abs
case 0x6E: ROR( & RAM[ fetch16() ] ); return 6; // ROR abs
// case 0x6F:
case 0x70: BVS( (int8_t)fetch() ); break; // BVS rel
case 0x71: ADC( memread( addr_ind_Y() ) ); return 5; // ADC ind,Y
// case 0x72:
// case 0x73:
// case 0x74:
case 0x75: ADC( memread( addr_zpg_X() ) ); return 4; // ADC zpg,X
case 0x76: ROR( & RAM[ addr_zpg_X() ] ); return 6; // ROR zpg,X
// case 0x77:
case 0x78: SEI(); break; // SEI
case 0x79: ADC( memread( addr_abs_Y() ) ); return 4; // ADC abs,Y
// case 0x7A:
// case 0x7B:
// case 0x7C:
case 0x7D: ADC( memread( addr_abs_X() ) ); return 4; // ADC abs,X
case 0x7E: ROR( & RAM[ addr_abs_X() ] ); return 7; // ROR abs,X
// case 0x7F:
// case 0x80:
case 0x81: STA( & RAM[ addr_X_ind() ] ) ; return 6; // STA X,ind
// case 0x82:
// case 0x83:
case 0x84: STY( & RAM[ fetch() ] ); return 3; // STY zpg
case 0x85: STA( & RAM[ fetch() ] ); return 3; // STA zpg
case 0x86: STX( & RAM[ fetch() ] ); return 3; // STX zpg
// case 0x87:
case 0x88: DEY(); return 2; // DEY
// case 0x89:
case 0x8A: TXA(); return 2; // TXA
// case 0x8B:
case 0x8C: STY( & RAM[ fetch16() ] ); return 4; // STY abs
case 0x8D: STA( & RAM[ fetch16() ] ); return 4; // STA abs
case 0x8E: STX( & RAM[ fetch16() ] ); return 4; // STX abs
// case 0x8F:
case 0x90: BCC( (int8_t)fetch() ); return 2; // BCC rel
case 0x91: STA( & RAM[ addr_ind_Y() ] ); return 6; // STA ind,Y
// case 0x92:
// case 0x93:
case 0x94: STY( & RAM[ addr_zpg_X() ] ); return 4; // STY zpg,X
case 0x95: STA( & RAM[ addr_zpg_X() ] ); return 4; // STA zpg,X
case 0x96: STX( & RAM[ addr_zpg_Y() ] ); return 4; // STX zpg,Y
// case 0x97:
case 0x98: TYA(); return 2; // TYA
case 0x99: STA( & RAM[ addr_abs_Y() ] ); return 5; // STA abs,Y
case 0x9A: TXS(); return 2; // TXS
// case 0x9B:
// case 0x9C:
case 0x9D: STA( & RAM[ addr_abs_X() ] ); return 5; // STA abs,X
// case 0x9E:
// case 0x9F:
case 0xA0: LDY( fetch() ); return 2; // LDY imm
case 0xA1: LDA( memread( addr_X_ind() ) ) ; return 6; // LDA X,ind
case 0xA2: LDX( fetch() ); return 2; // LDX imm
// case 0xA3:
case 0xA4: LDY( memread( fetch() ) ); return 3; // LDY zpg
case 0xA5: LDA( memread( fetch() ) ); return 3; // LDA zpg
case 0xA6: LDX( memread( fetch() ) ); return 3; // LDX zpg
// case 0xA7:
case 0xA8: TAY(); return 2; // TAY
case 0xA9: LDA( fetch() ); return 2; // LDA imm
case 0xAA: TAX(); return 2; // TAX
// case 0xAB:
case 0xAC: LDY( memread( fetch16() ) ); return 4; // LDY abs
case 0xAD: LDA( memread( fetch16() ) ); return 4; // LDA abs
case 0xAE: LDX( memread( fetch16() ) ); return 4; // LDX abs
// case 0xAF:
case 0xB0: BCS( (int8_t)fetch() ); return 2; // BCS rel
case 0xB1: LDA( memread( addr_ind_Y() ) ); return 5; // LDA ind,Y
// case 0xB2:
// case 0xB3:
case 0xB4: LDY( memread( addr_zpg_X() ) ); return 4; // LDY zpg,X
case 0xB5: LDA( memread( addr_zpg_X() ) ); return 4; // LDA zpg,X
case 0xB6: LDX( memread( addr_zpg_Y() ) ); return 4; // LDX zpg,Y
// case 0xB7:
case 0xB8: CLV(); return 2; // CLV
case 0xB9: LDA( memread( addr_abs_Y() ) ); return 4; // LDA abs,Y
case 0xBA: TSX(); return 2; // TSX
// case 0xBB:
case 0xBC: LDY( memread( addr_abs_X() ) ); return 4; // LDY abs,X
case 0xBD: LDA( memread( addr_abs_X() ) ); return 4; // LDA abs,X
case 0xBE: LDX( memread( addr_abs_X() ) ); return 4; // LDX abs,Y
// case 0xBF:
case 0xC0: CPY( fetch() ); break; // CPY imm
case 0xC1: CMP( memread( addr_X_ind() ) ) ; break; // LDA X,ind
// case 0xC2:
// case 0xC3:
case 0xC4: CPY( memread( fetch() ) ); return 3; // CPY zpg
case 0xC5: CMP( memread( fetch() ) ); return 3; // CMP zpg
case 0xC6: DEC( & RAM[ fetch() ] ); return 5; // DEC zpg
// case 0xC7:
case 0xC8: INY(); return 2; // INY
case 0xC9: CMP( fetch() ); return 2; // CMP imm
case 0xCA: DEX(); return 2; // DEX
// case 0xCB:
case 0xCC: CPY( memread( fetch16() ) ); return 4; // CPY abs
case 0xCD: CMP( fetch16() ); return 4; // CMP abs
case 0xCE: DEC( & RAM[ fetch16() ] ); return 4; // DEC abs
// case 0xCF:
case 0xD0: BNE( (int8_t)fetch() ); return 2; // BNE rel
case 0xD1: CMP( memread( addr_ind_Y() ) ); return 5; // CMP ind,Y
// case 0xD2:
// case 0xD3:
// case 0xD4:
case 0xD5: CMP( memread( addr_zpg_X() ) ); return 4; // CMP zpg,X
case 0xD6: DEC( & RAM[ addr_zpg_X() ] ); return 6; // DEC zpg,X
// case 0xD7:
case 0xD8: CLD(); return 2; // CLD
case 0xD9: CMP( memread( addr_abs_Y() ) ); return 4; // CMP abs,Y
// case 0xDA:
// case 0xDB:
// case 0xDC:
case 0xDD: CMP( memread( addr_abs_X() ) ); return 4; // CMP abs,X
case 0xDE: DEC( & RAM[ addr_abs_X() ] ); return 7; // DEC abs,X
// case 0xDF:
case 0xE0: CPX( fetch() ); return 2; // CPX imm
case 0xE1: SBC( memread( addr_X_ind() ) ) ; return 6; // SBC (ind,X)
// case 0xE2:
// case 0xE3:
case 0xE4: CPX( memread( fetch() ) ); return 3; // CPX zpg
case 0xE5: SBC( memread( fetch() ) ); return 3; // SBC zpg
case 0xE6: INC( & RAM[ fetch() ] ); return 5; // INC zpg
// case 0xE7:
case 0xE8: INX(); return 2; // INX
case 0xE9: SBC( fetch() ); return 2; // SBC imm
case 0xEA: NOP(); return 2; // NOP
// case 0xEB:
case 0xEC: CPX( memread( fetch16() ) ); return 4; // CPX abs
case 0xED: SBC( fetch16() ); return 4; // SBC abs
case 0xEE: INC( & RAM[ fetch16() ] ); return 6; // INC abs
// case 0xEF:
case 0xF0: BEQ( (int8_t)fetch() ); return 2; // BEQ rel
case 0xF1: SBC( memread( addr_ind_Y() ) ); return 5; // SBC ind,Y
// case 0xF2:
// case 0xF3:
// case 0xF4:
case 0xF5: SBC( memread( addr_zpg_X() ) ); return 4; // SBC zpg,X
case 0xF6: INC( & RAM[ addr_zpg_X() ] ); return 6; // INC zpg,X
// case 0xF7:
case 0xF8: SED(); break; // SED
case 0xF9: SBC( memread( addr_abs_Y() ) ); return 4; // SBC abs,Y
// case 0xFA:
// case 0xFB:
// case 0xFC:
case 0xFD: SBC( memread( addr_abs_X() ) ); return 4; // SBC abs,X
case 0xFE: INC( & RAM[ addr_abs_X() ] ); return 6; // INC abs,X
// case 0xFF:
default:
printf("Unimplemented Instruction 0x%02X\n", memread( m6502.pc -1 ));
break;
}
return 4;
}
const unsigned long long int iterations = G;
unsigned long long TICK_PER_SEC = G;
unsigned long long TICK_6502_PER_SEC = 0;
unsigned long long MHz_6502 = 1.024 * M;
static __inline__ unsigned long long rdtsc(void)
{
unsigned hi, lo;
__asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi) );
return ( (unsigned long long)lo) | ( ((unsigned long long)hi) << 32 );
}
static inline void m6502_run() {
uint8_t clk = 0;
// init time
// unsigned long long s = rdtsc();
unsigned long long e = (unsigned long long)-1LL;
// for ( unsigned long long int i = 0; i < iterations ; i++ ) {
for ( ; m6502.pc ; ) {
dbgPrintf("%04u %04X: ", clktime, m6502.pc);
clk = m6502_step();
clktime += clk;
e = TICK_6502_PER_SEC * clktime;
// query time + wait
// usleep(1);
// tight loop gives us the most precise wait time
// while ( rdtsc() - s < e ) {}
dbgPrintf("\n");
}
}
void init() {
// for ( int i = 0; i < 64*1024; i++ ) {
// mmio_read[i] = memread;
// }
unsigned long long s = rdtsc();
sleep(1);
unsigned long long e = rdtsc();
TICK_PER_SEC = e - s;
TICK_6502_PER_SEC = TICK_PER_SEC / MHz_6502;
memset( RAM, 0, sizeof(RAM) );
// RAM[ 0 ] = 0x4C;
// RAM[ 1 ] = 0;
// RAM[ 2 ] = 0;
//
// RAM[ 0xBFFD ] = 0x4C;
// RAM[ 0xBFFE ] = 0;
// RAM[ 0xBFFF ] = 0;
FILE * f = fopen("/Users/trudnai/Library/Containers/com.gamealloy.A2Mac/Data/apple.rom", "rb");
if (f == NULL) {
perror("Failed: ");
return;
}
fread( RAM + 0xD000, 1, 0x3000, f);
fclose(f);
// reset vector
m6502.pc = memread16( 0xFFFC );
m6502.sp = 0x01FF;
uint8_t counter[] = {
// 1 * COUNTER2
// 2
// 3 ORG $1000
// 4 SCREEN EQU $400
// 5 HOME EQU $FC58
// 6 DIGITS EQU $06
// 7 ZERO EQU $B0
// 8 CARRY EQU $BA
// 9 RDKEY EQU $FD0C
//10
// I have placed NOP to keep addresses
0xA0, 0x09, 0xEA, //11 LDY #$09 ; NOP
0x84, 0x06, //12 STY #DIGITS
0xEA, 0xEA, //13 NOP NOP
0xEA, 0xEA, 0xEA, //14 NOP NOP NOP
0xA6, 0x06, //15 LDY DIGITS
0xA9, 0xB0, //16 CLEAR LDA #ZERO
0x99, 0x00, 0x04, //17 STA SCREEN,Y
0x88, //18 DEY
0x10, 0xF8, //19 BPL CLEAR
0xA4, 0x06, //20 START LDY DIGITS
0x20, 0x36, 0x10, //21 ONES JSR INC
0xB9, 0x00, 0x04, //22 LDA SCREEN,Y
0xC9, 0xBA, //23 CMP #CARRY
0xD0, 0xF6, //24 BNE ONES
0xA9, 0xB0, //25 NEXT LDA #ZERO
0x99, 0x00, 0x04, //26 STA SCREEN,Y
0x88, //27 DEY
0x30, 0x0D, //28 BMI END
0x20, 0x36, 0x10, //29 JSR INC
0xB9, 0x00, 0x04, //30 LDA SCREEN,Y
0xC9, 0xBA, //31 CMP #CARRY
0xD0, 0xE2, //32 BNE START
0x4C, 0x20, 0x10, //33 JMP NEXT
0x60, //34 END RTS
0xB9, 0x00, 0x04, //36 INC LDA SCREEN,Y
0xAA, //37 TAX
0xE8, //38 INX
0x8A, //39 TXA
0x99, 0x00, 0x04, //40 STA SCREEN,Y
0x60, //41 RTS
};
uint8_t counter_fast[] = {
// 1 * COUNTER2
// 2
// 3 ORG $1000
// 4 SCREEN EQU $400
// 5 HOME EQU $FC58
// 6 DIGITS EQU $06
// 7 ZERO EQU $B0
// 8 CARRY EQU $BA
// 9 RDKEY EQU $FD0C
//10
// I have placed NOP to keep addresses
0xA0, 0x09, // 00 LDY #$09
0x84, 0x06, // 02 STY #DIGITS
0xA6, 0x06, // 04 LDY DIGITS
0xA9, 0xB0, // 06 CLEAR LDA #ZERO
0x99, 0x00, 0x04, // 08 STA SCREEN,Y
0x88, // 0B DEY
0x10, 0xF8, // 0C BPL CLEAR
0xA6, 0x06, // 0E START LDX DIGITS
0xA9, 0xBA, // 10 LDA #CARRY
0xFE, 0x00, 0x04, // 12 ONES INC SCREEN,X
0xDD, 0x00, 0x04, // 15 CMP SCREEN,X
0xD0, 0xF8, // 18 BNE ONES
0xA9, 0xB0, // 1A NEXT LDA #ZERO
0x9D, 0x00, 0x04, // 1C STA SCREEN,X
0xCA, // 1F DEX
0x30, 0x0C, // 20 BMI END
0xFE, 0x00, 0x04, // 22 INC SCREEN,X
0xBD, 0x00, 0x04, // 25 LDA SCREEN,X
0xC9, 0xBA, // 28 CMP #CARRY
0xD0, 0xE2, // 2A BNE START
0xF0, 0xEC, // 2C BEQ NEXT
0x60, // 2E END RTS
};
memcpy( RAM + 0x1000, counter_fast, sizeof(counter));
m6502.pc = 0x1000;
}
void tst6502() {
// insert code here...
printf("6502\n");
init();
// clock_t start = clock();
unsigned long long s = rdtsc();
m6502_run();
// clock_t end = clock();
// double execution_time = ((double) (end - start)) / CLOCKS_PER_SEC;
unsigned long long e = rdtsc();
unsigned long long t = e - s;
double execution_time = (double)t / TICK_PER_SEC;
double mips = iterations / (execution_time * M);
double mhz = clktime / (execution_time * M);
printf("clk:%llu Elpased time: (%llu / %llu / %llu), %.3lfs (%.3lf MIPS, %.3lf MHz)\n", clktime, TICK_PER_SEC, MHz_6502, TICK_6502_PER_SEC, execution_time, mips, mhz);
}
int ___main(int argc, const char * argv[]) {
tst6502();
return 0;
}

59
A2Mac/6502.h Normal file
View File

@ -0,0 +1,59 @@
//
// 6502.h
// 6502
//
// Created by Tamas Rudnai on 7/22/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_H__
#define __6502_H__
#import "stdint.h"
#ifdef DEBUG
#define dbgPrintf(format, ...) printf (format, ## __VA_ARGS__)
#else
#define dbgPrintf(format, ...)
#endif
#warning "HHH"
typedef struct m6502_s {
uint8_t A; // Accumulator
uint8_t X; // X index register
uint8_t Y; // Y index register
union {
uint8_t instr; // Instruction
struct {
uint8_t aaa:3;
uint8_t bbb:3;
uint8_t cc:2;
};
};
union {
uint8_t sr; // Status Register as 1 byte
struct {
uint8_t N:1; // Negative Flag
uint8_t V:1; // Overflow Flag ???
uint8_t B:2; // B Flag
uint8_t D:1; // Decimal Flag
uint8_t I:1; // Interrupt Flag
uint8_t Z:1; // Zero Flag
uint8_t C:1; // Carry Flag
} flags; // Status Register
};
uint16_t pc; // Program Counter
uint16_t sp; // Stack Pointer
unsigned clk; // Clock Counter
} m6502_s;
extern m6502_s m6502;
//extern uint8_t RAM[ 64 * 1024 ];
extern void tst6502();
#endif /* __6502_H__ */

View File

@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//
#import "6502.h"

211
A2Mac/Apple2_mmio.h Normal file
View File

@ -0,0 +1,211 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __APPLE2_MMIO_H__
#define __APPLE2_MMIO_H__
#include "common.h"
#include "6502.h"
enum mmio {
ioSomething = 0xC000,
};
uint8_t RAM[ 64 * KB ] = {0};
#define PAGESIZE 256
#define PAGES 16
uint8_t ram_0[PAGESIZE];
uint8_t ram_1[PAGESIZE];
uint8_t ram_2[PAGESIZE];
uint8_t ram_3[PAGESIZE];
uint8_t ram_4[PAGESIZE];
uint8_t ram_5[PAGESIZE];
uint8_t ram_6[PAGESIZE];
uint8_t ram_7[PAGESIZE];
uint8_t ram_8[PAGESIZE];
uint8_t ram_9[PAGESIZE];
uint8_t ram_A[PAGESIZE];
uint8_t ram_B[PAGESIZE];
uint8_t aui_C[PAGESIZE];
uint8_t rom_D[PAGESIZE];
uint8_t rom_E[PAGESIZE];
uint8_t rom_F[PAGESIZE];
uint8_t * ram[PAGES] = {
ram_0,
ram_1,
ram_2,
ram_3,
ram_4,
ram_5,
ram_6,
ram_7,
ram_8,
ram_9,
ram_A,
ram_B,
aui_C,
rom_D,
rom_E,
rom_F,
};
//uint8_t ( * mmio_read [ 64 * KB ] )( uint16_t addr );
static inline uint8_t mmioRead( uint16_t addr ) {
printf("mmio:%04X\n", addr);
switch (addr) {
case ioSomething:
return 123;
default:
break;
}
return 0;
}
/**
Naive implementation of RAM read from address
**/
static inline uint8_t memread( uint16_t addr ) {
if ( ( addr >= 0xC000 ) && ( addr < 0xD000 ) ) {
return mmioRead(addr);
}
dbgPrintf("%02X ", RAM[ addr ]);
return RAM[ addr ];
}
/**
Naive implementation of RAM read from address
**/
static inline uint16_t memread16( uint16_t addr ) {
// if ( ( addr >= 0xC000 ) && ( addr < 0xD000 ) ) {
// return mmioRead(addr);
// }
dbgPrintf("%04X ", * (uint16_t*) (& RAM[ addr ]));
return * (uint16_t*) (& RAM[ addr ]);
}
/**
Naive implementation of RAM read from address
**/
//static inline uint16_t memioread16( uint16_t addr ) {
// return (uint16_t)mmio_read[ addr ](addr);
//}
/**
Naive implementation of RAM write to address
**/
static void memwrite( uint16_t addr, uint8_t byte ) {
RAM[ addr ] = byte;
}
/**
Fetching 1 byte from memory address pc (program counter)
increase pc by one
**/
static inline uint8_t fetch() {
// dbgPrintf("%02X ", memread(m6502.pc));
// if ( m6502.pc == 0 ) {
// printf("******************** finished!!!\n");
// }
return memread( m6502.pc++ );
}
/**
Fetching 2 bytes as a 16 bit number from memory address pc (program counter)
increase pc by one
**/
static inline uint16_t fetch16() {
// dbgPrintf("%04X ", memread16(m6502.pc));
uint16_t word = memread16( m6502.pc );
m6502.pc += 2;
return word;
}
/**
get a 16 bit address from the zp:zp+1
**/
static inline uint16_t addr_zpg_ind( uint8_t zpg ) {
return memread16(zpg);
}
/**
X,ind .... X-indexed, indirect OPC ($LL,X)
operand is zeropage address;
effective address is word in (LL + X, LL + X + 1), inc. without carry: C.w($00LL + X)
**/
static inline uint16_t addr_X_ind() {
return addr_zpg_ind( fetch() + m6502.X );
}
/**
ind,Y .... indirect, Y-indexed OPC ($LL),Y
operand is zeropage address;
effective address is word in (LL, LL + 1) incremented by Y with carry: C.w($00LL) + Y
**/
static inline uint16_t addr_ind_Y() {
uint8_t a = fetch();
// dbgPrintf("addr_ind_Y: %04X + %02X = %04X ", addr_zpg_ind( a ), m6502.Y, addr_zpg_ind( a ) + m6502.Y);
return addr_zpg_ind( a ) + m6502.Y;
}
/**
abs,X .... absolute, X-indexed OPC $LLHH,X
operand is address; effective address is address incremented by X with carry **
**/
static inline uint16_t addr_abs_X() {
return fetch16() + m6502.X;
}
/**
abs,Y .... absolute, Y-indexed OPC $LLHH,Y
operand is address; effective address is address incremented by Y with carry **
**/
static inline uint16_t addr_abs_Y() {
return fetch16() + m6502.Y;
}
/**
zpg .... zeropage OPC $LL
operand is zeropage address (hi-byte is zero, address = $00LL)
**/
static inline uint16_t addr_zpg() {
return fetch();
}
/**
zpg,X .... zeropage, X-indexed OPC $LL,X
operand is zeropage address;
effective address is address incremented by X without carry **
**/
static inline uint16_t addr_zpg_X() {
return addr_zpg() + m6502.X;
}
/**
zpg,Y .... zeropage, Y-indexed OPC $LL,Y
operand is zeropage address;
effective address is address incremented by Y without carry **
**/
static inline uint16_t addr_zpg_Y() {
return addr_zpg() + m6502.Y;
}
#endif // __APPLE2_MMIO_H__

View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Application-->
@ -673,7 +674,7 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="target"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="A2Mac" customModuleProvider="target"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
@ -703,11 +704,25 @@
<!--View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="A2Mac" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uza-t6-XSw">
<rect key="frame" x="20" y="20" width="440" height="235"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="5AO-Gd-Lzo">
<font key="font" metaFont="fixedUser" size="11"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
<connections>
<outlet property="display" destination="5AO-Gd-Lzo" id="Khc-vv-2HB"/>
</connections>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>

View File

@ -20,6 +20,8 @@
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.education</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>

View File

@ -10,10 +10,25 @@ import Cocoa
class ViewController: NSViewController {
@IBOutlet weak var display: NSTextFieldCell!
override func viewDidLoad() {
super.viewDidLoad()
display.stringValue = "lll"
// Do any additional setup after loading the view.
// emulate in he background
// DispatchQueue.global(qos: .background).async {
tst6502()
// }
// let r = UnsafeMutablePointer<UInt8>(RAM)
// let text = ""
// while(true) {
// for i in 0x400...0x7FF {
// // text += r[i]
// }
// }
}
override var representedObject: Any? {
@ -22,6 +37,5 @@ class ViewController: NSViewController {
}
}
}

BIN
A2Mac/apple.rom Normal file

Binary file not shown.

79
A2Mac/common.h Normal file
View File

@ -0,0 +1,79 @@
//
// common.h
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __COMMON_H__
#define __COMMON_H__
#include "6502.h"
#define K 1000ULL
#define M (K * K)
#define G (M * K)
#define T (G * K)
#define KB 1024ULL
#define MB (KB * KB)
#define GB (MB * KB)
#define TB (GB * KB)
typedef
union {
uint8_t bits;
struct {
uint8_t b0:1;
uint8_t b1:1;
uint8_t b2:1;
uint8_t b3:1;
uint8_t b4:1;
uint8_t b5:1;
uint8_t b6:1;
uint8_t b7:1;
};
} bits_t;
#define BITTEST(n,x) ((bits_t)(n)).b##x
static inline void set_flags_N( uint8_t test ) {
m6502.flags.N = BITTEST(test, 7);
}
static inline void set_flags_V( uint8_t test ) {
m6502.flags.V = BITTEST(test, 6);
}
static inline void set_flags_Z( uint8_t test ) {
m6502.flags.Z = test == 0;
}
static inline void set_flags_NZ( uint8_t test ) {
set_flags_N(test);
set_flags_Z(test);
}
static inline void set_flags_NVZ( uint8_t test ) {
set_flags_NZ(test);
set_flags_V(test);
}
static inline void set_flags_NZC( int test ) {
set_flags_NZ(test);
m6502.flags.C = (unsigned)test > 0xFF;
}
static inline void set_flags_NZCV( int test ) {
set_flags_NZC(test);
set_flags_V(test);
}
#endif // __COMMON_H__

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,63 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_ARITHMETIC_H__
#define __6502_INSTR_ARITHMETIC_H__
#include "common.h"
/**
ADC Add Memory to Accumulator with Carry
A + M + C -> A, C N Z C I D V
+ + + - - +
addressing assembler opc bytes cyles
--------------------------------------------
immidiate ADC #oper 69 2 2
zeropage ADC oper 65 2 3
zeropage,X ADC oper,X 75 2 4
absolute ADC oper 6D 3 4
absolute,X ADC oper,X 7D 3 4*
absolute,Y ADC oper,Y 79 3 4*
(indirect,X) ADC (oper,X) 61 2 6
(indirect),Y ADC (oper),Y 71 2 5*
**/
static inline void ADC( uint8_t imm ) {
dbgPrintf("ADC ");
m6502.A += imm + m6502.flags.C;
set_flags_NZCV( m6502.A );
}
/**
SBC Subtract Memory from Accumulator with Borrow
A - M - C -> A N Z C I D V
+ + + - - +
addressing assembler opc bytes cyles
--------------------------------------------
immidiate SBC #oper E9 2 2
zeropage SBC oper E5 2 3
zeropage,X SBC oper,X F5 2 4
absolute SBC oper ED 3 4
absolute,X SBC oper,X FD 3 4*
absolute,Y SBC oper,Y F9 3 4*
(indirect,X) SBC (oper,X) E1 2 6
(indirect),Y SBC (oper),Y F1 2 5*
**/
static inline void SBC( uint8_t imm ) {
int tmp = (int)m6502.A - imm - m6502.flags.C;
dbgPrintf("SBC A:%02X - i:%02X - C:%u = %02X", m6502.A, imm, m6502.flags.C, tmp);
m6502.A = (uint8_t)tmp;
set_flags_NZCV( tmp );
}
#endif // __6502_INSTR_ARITHMETIC_H__

View File

@ -0,0 +1,144 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_BRANCH_H__
#define __6502_INSTR_BRANCH_H__
static inline void BR( int8_t reladdr ) {
m6502.pc += reladdr;
}
/**
BCC Branch on Carry Clear
branch on C = 0 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BCC oper 90 2 2**
**/
static inline void BCC( int8_t reladdr ) {
dbgPrintf("BCC ");
if ( m6502.flags.C == 0 )
BR( reladdr );
}
/**
BCS Branch on Carry Set
branch on C = 1 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BCS oper B0 2 2**
**/
static inline void BCS( int8_t reladdr ) {
dbgPrintf("BCS ");
if ( m6502.flags.C == 1 )
BR( reladdr );
}
/**
BNE Branch on Result not Zero
branch on Z = 0 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BNE oper D0 2 2**
**/
static inline void BNE( int8_t reladdr ) {
dbgPrintf("BNE ");
if ( m6502.flags.Z == 0 )
BR( reladdr );
}
/**
BEQ Branch on Result Zero
branch on Z = 1 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BEQ oper F0 2 2**
**/
static inline void BEQ( int8_t reladdr ) {
dbgPrintf("BEQ ");
if ( m6502.flags.Z == 1 )
BR( reladdr );
}
/**
BPL Branch on Result Plus
branch on N = 0 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BPL oper 10 2 2**
**/
static inline void BPL( int8_t reladdr ) {
dbgPrintf("BPL ");
if ( m6502.flags.N == 0 )
BR( reladdr );
}
/**
BMI Branch on Result Minus
branch on N = 1 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BMI oper 30 2 2**
**/
static inline void BMI( int8_t reladdr ) {
dbgPrintf("BMI ");
if ( m6502.flags.N == 1 )
BR( reladdr );
}
/**
BVC Branch on Overflow Clear
branch on V = 0 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BVC oper 50 2 2**
**/
static inline void BVC( int8_t reladdr ) {
dbgPrintf("BVC ");
if ( m6502.flags.V == 0 )
BR( reladdr );
}
/**
BVS Branch on Overflow Set
branch on V = 1 N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
relative BVC oper 70 2 2**
**/
static inline void BVS( int8_t reladdr ) {
dbgPrintf("BVS ");
if ( m6502.flags.V == 1 )
BR( reladdr );
}
#endif // __6502_INSTR_BRANCH_H__

View File

@ -0,0 +1,78 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_CALL_RET_JUMP_H__
#define __6502_INSTR_CALL_RET_JUMP_H__
/**
JMP Jump to New Location
(PC+1) -> PCL N Z C I D V
(PC+2) -> PCH - - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
absolute JMP oper 4C 3 3
indirect JMP (oper) 6C 3 5
**/
static inline void JMP( uint16_t addr ) {
dbgPrintf("JMP ");
m6502.pc = addr;
}
/**
JSR Jump to New Location Saving Return Address
push (PC+2), N Z C I D V
(PC+1) -> PCL - - - - - -
(PC+2) -> PCH
addressing assembler opc bytes cyles
--------------------------------------------
absolute JSR oper 20 3 6
**/
static inline void JSR( uint16_t addr ) {
dbgPrintf("JSR ");
PUSH_addr(m6502.pc);
JMP( addr );
}
/**
RTS Return from Subroutine
pull PC, PC+1 -> PC N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied RTS 60 1 6
**/
static inline void RTS() {
dbgPrintf("RTS ");
JMP( POP_addr() );
}
/**
RTI Return from Interrupt
pull SR, pull PC N Z C I D V
from stack
addressing assembler opc bytes cyles
--------------------------------------------
implied RTI 40 1 6
**/
static inline void RTI() {
dbgPrintf("RTI ");
m6502.sr = POP();
RTS();
}
#endif // __6502_INSTR_CALL_RET_JUMP_H__

View File

@ -0,0 +1,91 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_COMPARE_TEST_H__
#define __6502_INSTR_COMPARE_TEST_H__
/**
BIT Test Bits in Memory with Accumulator
bits 7 and 6 of operand are transfered to bit 7 and 6 of SR (N,V);
the zeroflag is set to the result of operand AND accumulator.
A AND M, M7 -> N, M6 -> V N Z C I D V
M7 + - - - M6
addressing assembler opc bytes cyles
--------------------------------------------
zeropage BIT oper 24 2 3
absolute BIT oper 2C 3 4
**/
static inline void BIT( uint8_t imm ) {
dbgPrintf("BIT ");
m6502.flags.N = BITTEST(imm, 7);
m6502.flags.V = BITTEST(imm, 6);
m6502.flags.Z = ( m6502.A & imm ) == 0;
}
/**
CMP Compare Memory with Accumulator
A - M N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate CMP #oper C9 2 2
zeropage CMP oper C5 2 3
zeropage,X CMP oper,X D5 2 4
absolute CMP oper CD 3 4
absolute,X CMP oper,X DD 3 4*
absolute,Y CMP oper,Y D9 3 4*
(indirect,X) CMP (oper,X) C1 2 6
(indirect),Y CMP (oper),Y D1 2 5*
**/
static inline void CMP( uint8_t imm ) {
dbgPrintf("CMP ");
set_flags_NZC( (int)m6502.A - imm );
}
/**
CPX Compare Memory and Index X
X - M N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate CPX #oper E0 2 2
zeropage CPX oper E4 2 3
absolute CPX oper EC 3 4
**/
static inline void CPX( uint8_t imm ) {
dbgPrintf("CPX ");
set_flags_NZC( (int)m6502.X - imm );
}
/**
CPY Compare Memory and Index Y
Y - M N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate CPY #oper C0 2 2
zeropage CPY oper C4 2 3
absolute CPY oper CC 3 4
**/
static inline void CPY( uint8_t imm ) {
dbgPrintf("CPY ");
set_flags_NZC( (int)m6502.Y - imm );
}
#endif // __6502_INSTR_COMPARE_TEST_H__

View File

@ -0,0 +1,116 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_INC_DEC_H__
#define __6502_INSTR_INC_DEC_H__
/**
INC Increment Memory by One
M + 1 -> M N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
zeropage INC oper E6 2 5
zeropage,X INC oper,X F6 2 6
absolute INC oper EE 3 6
absolute,X INC oper,X FE 3 7
**/
static inline void INC( uint8_t * dst ) {
dbgPrintf("INC ");
(*dst)++;
set_flags_NZ(*dst);
}
/**
INX Increment Index X by One
X + 1 -> X N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied INX E8 1 2
**/
static inline void INX() {
dbgPrintf("INX ");
m6502.X++;
set_flags_NZ(m6502.X);
}
/**
INY Increment Index Y by One
Y + 1 -> Y N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied INY C8 1 2
**/
static inline void INY() {
dbgPrintf("INY %02X -> ", m6502.Y);
set_flags_NZ(++m6502.Y);
dbgPrintf("%02X ", m6502.Y);
}
/**
DEC Decrement Memory by One
M - 1 -> M N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
zeropage DEC oper C6 2 5
zeropage,X DEC oper,X D6 2 6
absolute DEC oper CE 3 3
absolute,X DEC oper,X DE 3 7
**/
static inline void DEC( uint8_t * dst ) {
dbgPrintf("DEC ");
(*dst)--;
set_flags_NZ(*dst);
}
/**
DEX Decrement Index X by One
X - 1 -> X N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied DEC CA 1 2
**/
static inline void DEX() {
dbgPrintf("DEX ");
m6502.X--;
set_flags_NZ(m6502.X);
}
/**
DEY Decrement Index Y by One
Y - 1 -> Y N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied DEC 88 1 2
**/
static inline void DEY() {
dbgPrintf("DEY ");
m6502.Y--;
set_flags_NZ(m6502.Y);
}
#endif // __6502_INSTR_INC_DEC_H__

View File

@ -0,0 +1,160 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_LOAD_STORE_H__
#define __6502_INSTR_LOAD_STORE_H__
#include <ctype.h>
/**
LDA Load Accumulator with Memory
M -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate LDA #oper A9 2 2
zeropage LDA oper A5 2 3
zeropage,X LDA oper,X B5 2 4
absolute LDA oper AD 3 4
absolute,X LDA oper,X BD 3 4*
absolute,Y LDA oper,Y B9 3 4*
(indirect,X) LDA (oper,X) A1 2 6
(indirect),Y LDA (oper),Y B1 2 5*
**/
static inline void LDA( uint8_t imm ) {
dbgPrintf("LDA ");
m6502.A = imm;
set_flags_NZ(imm);
}
/**
LDX Load Index X with Memory
M -> X N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate LDX #oper A2 2 2
zeropage LDX oper A6 2 3
zeropage,Y LDX oper,Y B6 2 4
absolute LDX oper AE 3 4
absolute,Y LDX oper,Y BE 3 4*
**/
static inline void LDX( uint8_t imm ) {
dbgPrintf("LDX ");
m6502.X = imm;
set_flags_NZ(imm);
}
/**
LDY Load Index Y with Memory
M -> Y N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate LDY #oper A0 2 2
zeropage LDY oper A4 2 3
zeropage,X LDY oper,X B4 2 4
absolute LDY oper AC 3 4
absolute,X LDY oper,X BC 3 4*
**/
static inline void LDY( uint8_t imm ) {
dbgPrintf("LDY ");
m6502.Y = imm;
set_flags_NZ(imm);
}
char * charConv =
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?"
"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~?"
;
/**
STR Store Data in Destination
(not a real instruction, only a helper function)
**/
static inline void STR( uint8_t * dst, uint8_t imm ) {
*dst = imm;
uint16_t v = dst - RAM;
if ( ( v >= 0x400 ) && ( v < 0x800 ) ) {
char c = charConv[imm];
// if (( imm > ' ' ) && ( c < 0x7F ))
dbgPrintf("%04X: t:%02X '%c'\n", v, imm, isprint(c) ? c : ' ');
}
}
/**
STA Store Accumulator in Memory
A -> M N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
zeropage STA oper 85 2 3
zeropage,X STA oper,X 95 2 4
absolute STA oper 8D 3 4
absolute,X STA oper,X 9D 3 5
absolute,Y STA oper,Y 99 3 5
(indirect,X) STA (oper,X) 81 2 6
(indirect),Y STA (oper),Y 91 2 6
**/
static inline void STA( uint8_t * dst ) {
dbgPrintf("STA ");
STR(dst, m6502.A);
}
/**
STX Store Index X in Memory
X -> M N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
zeropage STX oper 86 2 3
zeropage,Y STX oper,Y 96 2 4
absolute STX oper 8E 3 4
**/
static inline void STX( uint8_t * dst ) {
dbgPrintf("STX ");
STR(dst, m6502.X);
}
/**
STY Sore Index Y in Memory
Y -> M N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
zeropage STY oper 84 2 3
zeropage,X STY oper,X 94 2 4
absolute STY oper 8C 3 4
**/
static inline void STY( uint8_t * dst ) {
dbgPrintf("STY ");
STR(dst, m6502.Y);
}
#endif // __6502_INSTR_LOAD_STORE_H__

View File

@ -0,0 +1,83 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_LOGIC_H__
#define __6502_INSTR_LOGIC_H__
/**
ORA OR Memory with Accumulator
A OR M -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate ORA #oper 09 2 2
zeropage ORA oper 05 2 3
zeropage,X ORA oper,X 15 2 4
absolute ORA oper 0D 3 4
absolute,X ORA oper,X 1D 3 4*
absolute,Y ORA oper,Y 19 3 4*
(indirect,X) ORA (oper,X) 01 2 6
(indirect),Y ORA (oper),Y 11 2 5*
**/
static inline void ORA( uint8_t imm ) {
dbgPrintf("ORA ");
m6502.A |= imm;
set_flags_NZ( m6502.A );
}
/**
AND AND Memory with Accumulator
A AND M -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate AND #oper 29 2 2
zeropage AND oper 25 2 3
zeropage,X AND oper,X 35 2 4
absolute AND oper 2D 3 4
absolute,X AND oper,X 3D 3 4*
absolute,Y AND oper,Y 39 3 4*
(indirect,X) AND (oper,X) 21 2 6
(indirect),Y AND (oper),Y 31 2 5*
**/
static inline void AND( uint8_t imm ) {
dbgPrintf("AND ");
m6502.A &= imm;
set_flags_NZ( m6502.A );
}
/**
EOR Exclusive-OR Memory with Accumulator
A EOR M -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
immidiate EOR #oper 49 2 2
zeropage EOR oper 45 2 3
zeropage,X EOR oper,X 55 2 4
absolute EOR oper 4D 3 4
absolute,X EOR oper,X 5D 3 4*
absolute,Y EOR oper,Y 59 3 4*
(indirect,X) EOR (oper,X) 41 2 6
(indirect),Y EOR (oper),Y 51 2 5*
**/
static inline void EOR( uint8_t imm ) {
dbgPrintf("EOR ");
m6502.A ^= imm;
set_flags_NZ( m6502.A );
}
#endif // __6502_INSTR_LOGIC_H__

View File

@ -0,0 +1,42 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_MISC_H__
#define __6502_INSTR_MISC_H__
/**
BRK Force Break
interrupt, N Z C I D V
push PC+2, push SR - - - 1 - -
addressing assembler opc bytes cyles
--------------------------------------------
implied BRK 00 1 7
**/
static inline void BRK() {
dbgPrintf("BRK ");
}
/**
NOP No Operation
--- N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied NOP EA 1 2
**/
static inline void NOP() {
dbgPrintf("STA ");
}
#endif // __6502_INSTR_MISC_H__

View File

@ -0,0 +1,118 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_SET_CLR_H__
#define __6502_INSTR_SET_CLR_H__
/**
CLC Clear Carry Flag
0 -> C N Z C I D V
- - 0 - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied CLC 18 1 2
**/
static inline void CLC() {
dbgPrintf("CLC ");
m6502.flags.C = 0;
}
/**
CLD Clear Decimal Mode
0 -> D N Z C I D V
- - - - 0 -
addressing assembler opc bytes cyles
--------------------------------------------
implied CLD D8 1 2
**/
static inline void CLD() {
dbgPrintf("CLD ");
m6502.flags.D = 0;
}
/**
CLI Clear Interrupt Disable Bit
0 -> I N Z C I D V
- - - 0 - -
addressing assembler opc bytes cyles
--------------------------------------------
implied CLI 58 1 2
**/
static inline void CLI() {
dbgPrintf("CLI ");
m6502.flags.I = 0;
}
/**
CLV Clear Overflow Flag
0 -> V N Z C I D V
- - - - - 0
addressing assembler opc bytes cyles
--------------------------------------------
implied CLV B8 1 2
**/
static inline void CLV() {
dbgPrintf("CLV ");
m6502.flags.V = 0;
}
/**
SEC Set Carry Flag
1 -> C N Z C I D V
- - 1 - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied SEC 38 1 2
**/
static inline void SEC() {
dbgPrintf("SEC ");
m6502.flags.C = 1;
}
/**
SED Set Decimal Flag
1 -> D N Z C I D V
- - - - 1 -
addressing assembler opc bytes cyles
--------------------------------------------
implied SED F8 1 2
**/
static inline void SED() {
dbgPrintf("SED ");
m6502.flags.D = 1;
}
/**
SEI Set Interrupt Disable Status
1 -> I N Z C I D V
- - - 1 - -
addressing assembler opc bytes cyles
--------------------------------------------
implied SEI 78 1 2
**/
static inline void SEI() {
dbgPrintf("SEI ");
m6502.flags.I = 1;
}
#endif // __6502_INSTR_SET_CLR_H__

View File

@ -0,0 +1,104 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_SHIFT_ROTATE_H__
#define __6502_INSTR_SHIFT_ROTATE_H__
/**
ASL Shift Left One Bit (Memory or Accumulator)
C <- [76543210] <- 0 N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
accumulator ASL A 0A 1 2
zeropage ASL oper 06 2 5
zeropage,X ASL oper,X 16 2 6
absolute ASL oper 0E 3 6
absolute,X ASL oper,X 1E 3 7
**/
static inline void ASL( uint8_t * dst ) {
dbgPrintf("ASL ");
m6502.flags.C = (*dst & (1<<7)) >> 7;
*dst <<= 1;
set_flags_NZ( *dst );
}
/**
LSR Shift One Bit Right (Memory or Accumulator)
0 -> [76543210] -> C N Z C I D V
0 + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
accumulator LSR A 4A 1 2
zeropage LSR oper 46 2 5
zeropage,X LSR oper,X 56 2 6
absolute LSR oper 4E 3 6
absolute,X LSR oper,X 5E 3 7
**/
static inline void LSR( uint8_t * dst ) {
dbgPrintf("LSR ");
m6502.flags.C = *dst & 1;
*dst >>= 1;
set_flags_NZ( *dst );
}
/**
ROL Rotate One Bit Left (Memory or Accumulator)
C <- [76543210] <- C N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
accumulator ROL A 2A 1 2
zeropage ROL oper 26 2 5
zeropage,X ROL oper,X 36 2 6
absolute ROL oper 2E 3 6
absolute,X ROL oper,X 3E 3 7
**/
static inline void ROL( uint8_t * dst ) {
dbgPrintf("ROL ");
uint8_t C = m6502.flags.C;
m6502.flags.C = (*dst & (1<<7)) >> 7;
*dst <<= 1;
*dst |= C;
set_flags_NZ( *dst );
}
/**
ROR Rotate One Bit Right (Memory or Accumulator)
C -> [76543210] -> C N Z C I D V
+ + + - - -
addressing assembler opc bytes cyles
--------------------------------------------
accumulator ROR A 6A 1 2
zeropage ROR oper 66 2 5
zeropage,X ROR oper,X 76 2 6
absolute ROR oper 6E 3 6
absolute,X ROR oper,X 7E 3 7
**/
static inline void ROR( uint8_t * dst ) {
dbgPrintf("ROR ");
uint8_t C = m6502.flags.C << 7;
m6502.flags.C = *dst;
*dst >>= 1;
*dst |= C;
set_flags_NZ( *dst );
}
#endif // __6502_INSTR_SHIFT_ROTATE_H__

View File

@ -0,0 +1,92 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_STACK_H__
#define __6502_INSTR_STACK_H__
static inline void PUSH( uint8_t n ) {
memwrite( m6502.sp--, n );
}
static inline uint8_t POP() {
return memread( ++m6502.sp );
}
static inline void PUSH_addr( uint16_t addr ) {
PUSH( (uint8_t)addr );
PUSH( (uint8_t)(addr >> 8) );
}
static inline uint16_t POP_addr() {
return ( POP() << 8 ) + POP();
}
/**
PHA Push Accumulator on Stack
push A N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied PHA 48 1 3
**/
static inline void PHA() {
dbgPrintf("PHA ");
PUSH( m6502.A );
}
/**
PLA Pull Accumulator from Stack
pull A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied PLA 68 1 4
**/
static inline void PLA() {
dbgPrintf("PLA ");
m6502.A = POP();
}
/**
PHP Push Processor Status on Stack
push SR N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied PHP 08 1 3
**/
static inline void PHP() {
dbgPrintf("PHP ");
PUSH( m6502.sr );
}
/**
PLP Pull Processor Status from Stack
pull SR N Z C I D V
from stack
addressing assembler opc bytes cyles
--------------------------------------------
implied PLP 28 1 4
**/
static inline void PLP() {
dbgPrintf("PLP ");
m6502.sr = POP();
}
#endif // __6502_INSTR_STACK_H__

View File

@ -0,0 +1,110 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTR_TRANSFER_H__
#define __6502_INSTR_TRANSFER_H__
/**
TAX Transfer Accumulator to Index X
A -> X N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TAX AA 1 2
**/
static inline void TAX() {
dbgPrintf("TAX ");
m6502.X = m6502.A;
set_flags_NZ(m6502.X);
}
/**
TXA Transfer Index X to Accumulator
X -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TXA 8A 1 2
**/
static inline void TXA() {
dbgPrintf("TXA ");
m6502.A = m6502.X;
set_flags_NZ(m6502.A);
}
/**
TAY Transfer Accumulator to Index Y
A -> Y N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TAY A8 1 2
**/
static inline void TAY() {
dbgPrintf("TAY ");
m6502.Y = m6502.A;
set_flags_NZ(m6502.Y);
}
/**
TYA Transfer Index Y to Accumulator
Y -> A N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TYA 98 1 2
**/
static inline void TYA() {
dbgPrintf("TYA ");
m6502.A = m6502.Y;
set_flags_NZ(m6502.A);
}
/**
TSX Transfer Stack Pointer to Index X
SP -> X N Z C I D V
+ + - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TSX BA 1 2
**/
static inline void TSX() {
dbgPrintf("TSX ");
m6502.X = m6502.sp;
set_flags_NZ(m6502.X);
}
/**
TXS Transfer Index X to Stack Register
X -> SP N Z C I D V
- - - - - -
addressing assembler opc bytes cyles
--------------------------------------------
implied TXS 9A 1 2
**/
static inline void TXS() {
dbgPrintf("TXS ");
m6502.sp = m6502.X;
}
#endif // __6502_INSTR_TRANSFER_H__

View File

@ -0,0 +1,27 @@
//
// main.c
// 6502
//
// Created by Tamas Rudnai on 7/14/19.
// Copyright © 2019 GameAlloy. All rights reserved.
//
#ifndef __6502_INSTRUCTIONS_H__
#define __6502_INSTRUCTIONS_H__
#include "6502_instr_load_store.h"
#include "6502_instr_arithmetic.h"
#include "6502_instr_inc_dec.h"
#include "6502_instr_shift_rotate.h"
#include "6502_instr_logic.h"
#include "6502_instr_compare_test.h"
#include "6502_instr_branch.h"
#include "6502_instr_transfer.h"
#include "6502_instr_stack.h"
#include "6502_instr_call_ret_jump.h"
#include "6502_instr_set_clr.h"
#include "6502_instr_misc.h"
#endif // __6502_INSTRUCTIONS_H__