Skip to content
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.

Sign up for GitHub

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

Performance Stats + Instructions #284

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Performance Stats + Instructions #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
36b7218
Add files via upload
mikey-b May 14, 2020
0b73316
Update video.c
mikey-b May 14, 2020
901e612
Update video.c
mikey-b May 14, 2020
81fb91c
Add files via upload
mikey-b May 16, 2020
fbd2cc4
Update video.c
mikey-b May 16, 2020
08f2789
Update video.c
mikey-b May 16, 2020
410196d
Update video.c
mikey-b May 16, 2020
ee69603
Update main.c
mikey-b May 17, 2020
bec7ae8
Update video.h
mikey-b May 17, 2020
0d80aac
Update video.c
mikey-b May 17, 2020
c3b76de
Update video.c
mikey-b Jul 9, 2020
c6e016d
Merge pull request #1 from commanderx16/master
mikey-b Jul 9, 2020
c74a5ce
Make instructions branchless
mikey-b Jul 9, 2020
817140f
Update fake6502.c
mikey-b Jul 9, 2020
ec3d499
Update 65c02.h
mikey-b Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cpu/65c02.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ static void stz() {
// *******************************************************************************************

static void bra() {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}

// *******************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion cpu/fake6502.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ uint8_t sp, a, x, y, status;
//helper variables
uint32_t instructions = 0; //keep track of total instructions executed
uint32_t clockticks6502 = 0, clockgoal6502 = 0;
uint16_t oldpc, ea, reladdr, value, result;
uint16_t ea, reladdr, value, result;
uint8_t opcode, oldstatus;

uint8_t penaltyop, penaltyaddr;
Expand Down
48 changes: 24 additions & 24 deletions cpu/instructions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,28 +80,28 @@ static void asl() {

static void bcc() {
if ((status & FLAG_CARRY) == 0) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

static void bcs() {
if ((status & FLAG_CARRY) == FLAG_CARRY) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

static void beq() {
if ((status & FLAG_ZERO) == FLAG_ZERO) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

Expand All @@ -115,28 +115,28 @@ static void bit() {

static void bmi() {
if ((status & FLAG_SIGN) == FLAG_SIGN) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

static void bne() {
if ((status & FLAG_ZERO) == 0) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

static void bpl() {
if ((status & FLAG_SIGN) == 0) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

Expand All @@ -153,19 +153,19 @@ static void brk() {

static void bvc() {
if ((status & FLAG_OVERFLOW) == 0) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

static void bvs() {
if ((status & FLAG_OVERFLOW) == FLAG_OVERFLOW) {
oldpc = pc;
uint16_t oldpc = pc;
pc += reladdr;
if ((oldpc & 0xFF00) != (pc & 0xFF00)) clockticks6502 += 2; //check if jump crossed a page boundary
else clockticks6502++;
clockticks6502 += 1;
clockticks6502 += ((oldpc & 0xFF00) != (pc & 0xFF00)); //check if jump crossed a page boundary
}
}

Expand Down
2 changes: 1 addition & 1 deletion main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ emulator_loop(void *param)
spi_step();
joystick_step();
vera_spi_step();
new_frame |= video_step(MHZ);
new_frame |= video_step();
}
audio_render(clocks);

Expand Down
2 changes: 1 addition & 1 deletion video.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

bool video_init(int window_scale, char *quality);
void video_reset(void);
bool video_step(float mhz);
bool video_step();
bool video_update(void);
void video_end(void);
bool video_get_irq_out(void);
Expand Down