Conversion of V65C02 to pointers, misc. whitespace cleanups.
This commit is contained in:
Shamus Hammons
parent
92fbd44509
commit
6bdd378e27
3
Makefile
3
Makefile
|
|
@ -2,7 +2,7 @@
|
|||
# Unified Makefile for Apple 2 SDL
|
||||
#
|
||||
# by James Hammons
|
||||
# (C) 2005-17 Underground Software
|
||||
# (C) 2005-2018 Underground Software
|
||||
# This software is licensed under the GPL v3
|
||||
#
|
||||
|
||||
|
|
@ -109,6 +109,7 @@ OBJS = \
|
|||
obj/apple2-icon-64x64.o \
|
||||
obj/ay8910.o \
|
||||
obj/charset.o \
|
||||
obj/crc32.o \
|
||||
obj/dis65c02.o \
|
||||
obj/firmware.o \
|
||||
obj/floppy.o \
|
||||
|
|
|
|||
|
|
@ -494,7 +494,7 @@ static void AppleTimer(uint16_t cycles)
|
|||
if (mbvia[0].ier & 0x40)
|
||||
{
|
||||
mbvia[0].ifr |= (0x80 | 0x40);
|
||||
AssertLine(V65C02_ASSERT_LINE_IRQ);
|
||||
mainCPU.cpuFlags |= V65C02_ASSERT_LINE_IRQ;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -512,7 +512,7 @@ static void AppleTimer(uint16_t cycles)
|
|||
if (mbvia[1].ier & 0x40)
|
||||
{
|
||||
mbvia[1].ifr |= (0x80 | 0x40);
|
||||
AssertLine(V65C02_ASSERT_LINE_NMI);
|
||||
mainCPU.cpuFlags |= V65C02_ASSERT_LINE_NMI;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -531,7 +531,7 @@ static void AppleTimer(uint16_t cycles)
|
|||
if (cyclesForSample >= 21.26009)
|
||||
{
|
||||
#if 0
|
||||
sampleClock = GetCurrentV65C02Clock();
|
||||
sampleClock = mainCPU.clock;
|
||||
WriteLog(" cyclesForSample = %lf (%d samples, cycles=%d)\n", cyclesForSample, sampleClock - lastSampleClock, cycles);
|
||||
sampleCount++;
|
||||
lastSampleClock = sampleClock;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
//
|
||||
// AY-3-8910 Emulator
|
||||
//
|
||||
// This was written mainly from the General Instruments datasheet for the 8910
|
||||
|
|
|
|||
|
|
@ -0,0 +1,63 @@
|
|||
//
|
||||
// CRC32 support
|
||||
//
|
||||
// by David Raingeard & James Hammons
|
||||
// (C) 2010-2018 Underground Software
|
||||
//
|
||||
// JLH = James Hammons <jlhamm@acm.org>
|
||||
//
|
||||
// Who When What
|
||||
// --- ---------- -----------------------------------------------------------
|
||||
// JLH 01/16/2010 Created this log ;-)
|
||||
//
|
||||
|
||||
#include "crc32.h"
|
||||
|
||||
|
||||
static uint32_t crcTable[256] =
|
||||
{
|
||||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
|
||||
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
|
||||
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
|
||||
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
|
||||
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
|
||||
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
|
||||
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
|
||||
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
|
||||
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
|
||||
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
|
||||
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
|
||||
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
|
||||
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
|
||||
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
|
||||
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
|
||||
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
|
||||
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
|
||||
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
|
||||
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
|
||||
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
|
||||
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
|
||||
};
|
||||
|
||||
|
||||
uint32_t CRC32(uint8_t * data, uint32_t length)
|
||||
{
|
||||
uint32_t crc = 0xFFFFFFFF;
|
||||
|
||||
for(uint32_t i=0; i<length; i++)
|
||||
crc = crcTable[(crc ^ *data++) & 0xFF] ^ (crc >> 8);
|
||||
|
||||
return crc ^ 0xFFFFFFFF;
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
//
|
||||
// CRC32.H
|
||||
//
|
||||
|
||||
#ifndef __CRC32_H__
|
||||
#define __CRC32_H__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
uint32_t CRC32(uint8_t * data, uint32_t length);
|
||||
|
||||
#endif // __CRC32_H__
|
||||
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
// 65C02 disassembler
|
||||
//
|
||||
// by James Hammons
|
||||
// (c) 2005 Underground Software
|
||||
// (c) 2005-2018 Underground Software
|
||||
//
|
||||
|
||||
#include "dis65c02.h"
|
||||
|
|
@ -10,14 +10,9 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include "log.h"
|
||||
#include "v65c02.h"
|
||||
|
||||
|
||||
// External shit
|
||||
|
||||
extern V65C02REGS mainCPU;//Hm. Shouldn't we pass this shit in? ANSWER: YES. !!! FIX !!!
|
||||
|
||||
// Private globals variables
|
||||
// Private global variables
|
||||
|
||||
static uint8_t op_mat[256] = {
|
||||
14, 6, 0, 0, 2, 2, 2, 2, 14, 1, 14, 0, 8, 8, 8, 13,
|
||||
|
|
@ -77,7 +72,7 @@ static uint8_t mnemonics[256][5] = {
|
|||
//
|
||||
// Display bytes in mem in hex
|
||||
//
|
||||
static void DisplayBytes(char * outbuf, uint16_t src, uint32_t dst)
|
||||
static void DisplayBytes(V65C02REGS * regs, char * outbuf, uint16_t src, uint32_t dst)
|
||||
{
|
||||
char buf[32];
|
||||
sprintf(outbuf, "%04X: ", src);
|
||||
|
|
@ -89,7 +84,7 @@ static void DisplayBytes(char * outbuf, uint16_t src, uint32_t dst)
|
|||
|
||||
for(uint32_t i=src; i<dst; i++)
|
||||
{
|
||||
sprintf(buf, "%02X ", mainCPU.RdMem(i));
|
||||
sprintf(buf, "%02X ", regs->RdMem(i));
|
||||
strcat(outbuf, buf);
|
||||
cnt++;
|
||||
}
|
||||
|
|
@ -106,13 +101,13 @@ static void DisplayBytes(char * outbuf, uint16_t src, uint32_t dst)
|
|||
//
|
||||
// Decode a 65C02 instruction
|
||||
//
|
||||
int Decode65C02(char * outbuf, uint16_t pc)
|
||||
int Decode65C02(V65C02REGS * regs, char * outbuf, uint16_t pc)
|
||||
{
|
||||
char buf[32], buf2[32];
|
||||
|
||||
uint16_t addr = pc;
|
||||
uint16_t w;
|
||||
uint8_t opcode = mainCPU.RdMem(addr++); // Get the opcode
|
||||
uint8_t opcode = regs->RdMem(addr++); // Get the opcode
|
||||
|
||||
switch (op_mat[opcode]) // Decode the addressing mode...
|
||||
{
|
||||
|
|
@ -120,53 +115,53 @@ int Decode65C02(char * outbuf, uint16_t pc)
|
|||
sprintf(buf, "???");
|
||||
break;
|
||||
case 1: // Immediate
|
||||
sprintf(buf, "%s #$%02X", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s #$%02X", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 2: // Zero page
|
||||
sprintf(buf, "%s $%02X", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s $%02X", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 3: // Zero page, X
|
||||
sprintf(buf, "%s $%02X,X", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s $%02X,X", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 4: // Zero page, Y
|
||||
sprintf(buf, "%s $%02X,Y", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s $%02X,Y", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 5: // Zero page indirect
|
||||
sprintf(buf, "%s ($%02X)", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s ($%02X)", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 6: // Zero page, X indirect
|
||||
sprintf(buf, "%s ($%02X,X)", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s ($%02X,X)", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 7: // Zero page, Y indirect
|
||||
sprintf(buf, "%s ($%02X),Y", mnemonics[opcode], mainCPU.RdMem(addr++));
|
||||
sprintf(buf, "%s ($%02X),Y", mnemonics[opcode], regs->RdMem(addr++));
|
||||
break;
|
||||
case 8: // Absolute
|
||||
w = mainCPU.RdMem(addr++);
|
||||
w |= mainCPU.RdMem(addr++) << 8;
|
||||
w = regs->RdMem(addr++);
|
||||
w |= regs->RdMem(addr++) << 8;
|
||||
sprintf(buf, "%s $%04X", mnemonics[opcode], w);
|
||||
break;
|
||||
case 9: // Absolute, X
|
||||
w = mainCPU.RdMem(addr++);
|
||||
w |= mainCPU.RdMem(addr++) << 8;
|
||||
w = regs->RdMem(addr++);
|
||||
w |= regs->RdMem(addr++) << 8;
|
||||
sprintf(buf, "%s $%04X,X", mnemonics[opcode], w);
|
||||
break;
|
||||
case 10: // Absolute, Y
|
||||
w = mainCPU.RdMem(addr++);
|
||||
w |= mainCPU.RdMem(addr++) << 8;
|
||||
w = regs->RdMem(addr++);
|
||||
w |= regs->RdMem(addr++) << 8;
|
||||
sprintf(buf, "%s $%04X,Y", mnemonics[opcode], w);
|
||||
break;
|
||||
case 11: // Indirect
|
||||
w = mainCPU.RdMem(addr++);
|
||||
w |= mainCPU.RdMem(addr++) << 8;
|
||||
w = regs->RdMem(addr++);
|
||||
w |= regs->RdMem(addr++) << 8;
|
||||
sprintf(buf, "%s ($%04X)", mnemonics[opcode], w);
|
||||
break;
|
||||
case 12: // Indirect, X
|
||||
w = mainCPU.RdMem(addr++);
|
||||
w |= mainCPU.RdMem(addr++) << 8;
|
||||
w = regs->RdMem(addr++);
|
||||
w |= regs->RdMem(addr++) << 8;
|
||||
sprintf(buf, "%s ($%04X,X)", mnemonics[opcode], w);
|
||||
break;
|
||||
case 13: // Relative
|
||||
sprintf(buf, "%s $%04X", mnemonics[opcode], addr + (int16_t)((int8_t)mainCPU.RdMem(addr)) + 1);
|
||||
sprintf(buf, "%s $%04X", mnemonics[opcode], addr + (int16_t)((int8_t)regs->RdMem(addr)) + 1);
|
||||
addr++;
|
||||
break;
|
||||
case 14: // Inherent
|
||||
|
|
@ -174,7 +169,7 @@ int Decode65C02(char * outbuf, uint16_t pc)
|
|||
break;
|
||||
}
|
||||
|
||||
DisplayBytes(buf2, pc, addr); // Show bytes
|
||||
DisplayBytes(regs, buf2, pc, addr); // Show bytes
|
||||
sprintf(outbuf, "%s %-14s", buf2, buf); // Display opcode & addressing, etc.
|
||||
|
||||
return addr - pc;
|
||||
|
|
|
|||
|
|
@ -2,15 +2,16 @@
|
|||
// DIS65C02.H
|
||||
//
|
||||
// by James Hammons
|
||||
// (C) 2004 Underground Software
|
||||
// (C) 2004-2018 Underground Software
|
||||
//
|
||||
|
||||
#ifndef __DIS65C02_H__
|
||||
#define __DIS65C02_H__
|
||||
|
||||
#include <stdint.h>
|
||||
#include "v65c02.h"
|
||||
|
||||
int Decode65C02(char * outbuf, uint16_t pc);
|
||||
int Decode65C02(V65C02REGS *, char * outbuf, uint16_t pc);
|
||||
|
||||
#endif // __DIS65C02_H__
|
||||
|
||||
|
|
|
|||
|
|
@ -89,3 +89,4 @@ class FloppyDrive
|
|||
};
|
||||
|
||||
#endif // __FLOPPY_H__
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// mmu.cpp: Memory management
|
||||
//
|
||||
// by James Hammons
|
||||
// (C) 2013 Underground Software
|
||||
// (C) 2013-2018 Underground Software
|
||||
//
|
||||
// JLH = James Hammons <jlhamm@acm.org>
|
||||
//
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// Sound Interface
|
||||
//
|
||||
// by James Hammons
|
||||
// (C) 2005 Underground Software
|
||||
// (C) 2005-2018 Underground Software
|
||||
//
|
||||
// JLH = James Hammons <jlhamm@acm.org>
|
||||
//
|
||||
|
|
@ -47,10 +47,6 @@ static bool soundInitialized = false;
|
|||
static bool speakerState = false;
|
||||
static uint16_t soundBuffer[SOUND_BUFFER_SIZE];
|
||||
static uint32_t soundBufferPos;
|
||||
//static uint64_t lastToggleCycles;
|
||||
//static SDL_cond * conditional = NULL;
|
||||
//static SDL_mutex * mutex = NULL;
|
||||
//static SDL_mutex * mutex2 = NULL;
|
||||
static uint16_t sample;
|
||||
static uint8_t ampPtr = 12; // Start with -2047 - +2047
|
||||
static int16_t amplitude[17] = { 0, 1, 2, 3, 7, 15, 31, 63, 127, 255,
|
||||
|
|
@ -61,6 +57,10 @@ static int16_t amplitude[17] = { 0, 1, 2, 3, 7, 15, 31, 63, 127, 255,
|
|||
static void SDLSoundCallback(void * userdata, Uint8 * buffer, int length);
|
||||
|
||||
|
||||
/*
|
||||
N.B: We can convert this from the current callback model to a push model by using SDL_QueueAudio(SDL_AudioDeviceID id, const void * data, Uint32 len) where id is the audio device ID, data is a pointer to the sound buffer, and len is the size of the buffer in *bytes* (not samples!). To use this method, we need to set up things as usual but instead of putting the callback function pointer in desired.callback, we put a NULL there. The downside is that we can't tell if the buffer is being starved or not, which is why we haven't kicked it to the curb just yet--we want to know why we're still getting buffer starvation even if it's not as frequent as it used to be. :-/
|
||||
You can get the size of the audio already queued with SDL_GetQueuedAudioSize(SDL_AudioDeviceID id), which will return the size of the buffer in bytes (again, *not* samples!).
|
||||
*/
|
||||
//
|
||||
// Initialize the SDL sound system
|
||||
//
|
||||
|
|
@ -81,14 +81,10 @@ void SoundInit(void)
|
|||
return;
|
||||
}
|
||||
|
||||
// conditional = SDL_CreateCond();
|
||||
// mutex = SDL_CreateMutex();
|
||||
// mutex2 = SDL_CreateMutex();// Let's try real signalling...
|
||||
soundBufferPos = 0;
|
||||
// lastToggleCycles = 0;
|
||||
sample = desired.silence; // ? wilwok ? yes
|
||||
sample = desired.silence; // ? wilwok ? yes
|
||||
|
||||
SDL_PauseAudioDevice(device, 0); // Start playback!
|
||||
SDL_PauseAudioDevice(device, 0);// Start playback!
|
||||
soundInitialized = true;
|
||||
WriteLog("Sound: Successfully initialized.\n");
|
||||
}
|
||||
|
|
@ -103,9 +99,6 @@ void SoundDone(void)
|
|||
{
|
||||
SDL_PauseAudioDevice(device, 1);
|
||||
SDL_CloseAudioDevice(device);
|
||||
// SDL_DestroyCond(conditional);
|
||||
// SDL_DestroyMutex(mutex);
|
||||
// SDL_DestroyMutex(mutex2);
|
||||
WriteLog("Sound: Done.\n");
|
||||
}
|
||||
}
|
||||
|
|
@ -133,18 +126,11 @@ static uint32_t lastStarve = 0;
|
|||
static void SDLSoundCallback(void * /*userdata*/, Uint8 * buffer8, int length8)
|
||||
{
|
||||
sndFrmCnt++;
|
||||
//WriteLog("SDLSoundCallback(): begin (soundBufferPos=%i)\n", soundBufferPos);
|
||||
|
||||
// Let's try using a mutex for shared resource consumption...
|
||||
//Actually, I think Lock/UnlockAudio() does this already...
|
||||
//WriteLog("SDLSoundCallback: soundBufferPos = %i\n", soundBufferPos);
|
||||
// SDL_mutexP(mutex2);
|
||||
|
||||
// Recast this as a 16-bit type...
|
||||
uint16_t * buffer = (uint16_t *)buffer8;
|
||||
uint32_t length = (uint32_t)length8 / 2;
|
||||
|
||||
//WriteLog("SDLSoundCallback(): filling buffer...\n");
|
||||
if (soundBufferPos < length)
|
||||
{
|
||||
WriteLog("*** Sound buffer starved (%d short) *** [%d delta %d]\n", length - soundBufferPos, sndFrmCnt, sndFrmCnt - lastStarve);
|
||||
|
|
@ -177,17 +163,12 @@ lastStarve = sndFrmCnt;
|
|||
for(uint32_t i=0; i<soundBufferPos; i++)
|
||||
soundBuffer[i] = soundBuffer[length + i];
|
||||
}
|
||||
|
||||
// Free the mutex...
|
||||
//WriteLog("SDLSoundCallback(): SDL_mutexV(mutex2)\n");
|
||||
// SDL_mutexV(mutex2);
|
||||
// Wake up any threads waiting for the buffer to drain...
|
||||
// SDL_CondSignal(conditional);
|
||||
//WriteLog("SDLSoundCallback(): end\n");
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// This is called by the main CPU thread every ~21.666 cycles.
|
||||
//
|
||||
void WriteSampleToBuffer(void)
|
||||
{
|
||||
#ifdef USE_NEW_AY8910
|
||||
|
|
@ -202,31 +183,17 @@ void WriteSampleToBuffer(void)
|
|||
int16_t adjustedMockingboard = (s1 / 8) + (s2 / 8) + (s3 / 8)
|
||||
+ (s4 / 8) + (s5 / 8) + (s6 / 8);
|
||||
#endif
|
||||
//need to do this *before* mixing, as by this time, it's too late and the sample is probably already oversaturated
|
||||
// adjustedMockingboard /= 8;
|
||||
|
||||
//WriteLog("WriteSampleToBuffer(): SDL_mutexP(mutex2)\n");
|
||||
// SDL_mutexP(mutex2);
|
||||
|
||||
// This should almost never happen, but, if it does...
|
||||
while (soundBufferPos >= (SOUND_BUFFER_SIZE - 1))
|
||||
{
|
||||
//WriteLog("WriteSampleToBuffer(): Waiting for sound thread. soundBufferPos=%i, SOUNDBUFFERSIZE-1=%i\n", soundBufferPos, SOUND_BUFFER_SIZE-1);
|
||||
// SDL_mutexV(mutex2); // Release it so sound thread can get it,
|
||||
// SDL_mutexP(mutex); // Must lock the mutex for the cond to work properly...
|
||||
// SDL_CondWait(conditional, mutex); // Sleep/wait for the sound thread
|
||||
// SDL_mutexV(mutex); // Must unlock the mutex for the cond to work properly...
|
||||
// SDL_mutexP(mutex2); // Re-lock it until we're done with it...
|
||||
SDL_Delay(1);
|
||||
}
|
||||
|
||||
SDL_LockAudioDevice(device);
|
||||
soundBuffer[soundBufferPos++] = sample + adjustedMockingboard;
|
||||
SDL_UnlockAudioDevice(device);
|
||||
|
||||
// soundBuffer[soundBufferPos++] = sample;
|
||||
//WriteLog("WriteSampleToBuffer(): SDL_mutexV(mutex2)\n");
|
||||
// SDL_mutexV(mutex2);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -236,7 +203,7 @@ void ToggleSpeaker(void)
|
|||
return;
|
||||
|
||||
speakerState = !speakerState;
|
||||
sample = (speakerState ? amplitude[ampPtr] : 0);//-amplitude[ampPtr]);
|
||||
sample = (speakerState ? amplitude[ampPtr] : 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
// Global variables (exported)
|
||||
|
||||
|
||||
// Functions
|
||||
// Exported functions
|
||||
|
||||
void SoundInit(void);
|
||||
void SoundDone(void);
|
||||
|
|
|
|||
800
src/v65c02.cpp
800
src/v65c02.cpp
File diff suppressed because it is too large
Load Diff
10
src/v65c02.h
10
src/v65c02.h
|
|
@ -2,7 +2,7 @@
|
|||
// Virtual 65C02 Header file
|
||||
//
|
||||
// by James Hammons
|
||||
// (c) 2005 Underground Software
|
||||
// (c) 2005-2018 Underground Software
|
||||
//
|
||||
|
||||
#ifndef __V65C02_H__
|
||||
|
|
@ -37,7 +37,7 @@ struct V65C02REGS
|
|||
uint8_t a; // 65C02 A register
|
||||
uint8_t x; // 65C02 X index register
|
||||
uint8_t y; // 65C02 Y register
|
||||
uint64_t clock; // 65C02 clock (@ 1 MHz, wraps at 570,842 years)
|
||||
uint64_t clock; // 65C02 clock (@1 MHz, wraps at 570,842 years)
|
||||
uint8_t (* RdMem)(uint16_t); // Address of BYTE read routine
|
||||
void (* WrMem)(uint16_t, uint8_t); // Address of BYTE write routine
|
||||
void (* Timer)(uint16_t); // Address of Timer routine
|
||||
|
|
@ -49,11 +49,9 @@ struct V65C02REGS
|
|||
|
||||
extern bool dumpDis;
|
||||
|
||||
// Function prototypes
|
||||
// Exported functions
|
||||
|
||||
void Execute65C02(V65C02REGS *, uint32_t); // Function to execute 65C02 instructions
|
||||
uint64_t GetCurrentV65C02Clock(void); // Get the clock of the currently executing CPU
|
||||
void AssertLine(uint16_t); // Assert 65C02 line in current context
|
||||
void Execute65C02(V65C02REGS *, uint32_t);
|
||||
|
||||
#endif // __V65C02_H__
|
||||
|
||||
|
|
|
|||
37
src/video.h
37
src/video.h
|
|
@ -8,12 +8,21 @@
|
|||
#include <SDL2/SDL.h>
|
||||
|
||||
// These are double the normal width because we use sub-pixel rendering.
|
||||
//#define VIRTUAL_SCREEN_WIDTH 280
|
||||
#define VIRTUAL_SCREEN_WIDTH 560
|
||||
//#define VIRTUAL_SCREEN_HEIGHT 192
|
||||
#define VIRTUAL_SCREEN_HEIGHT 384
|
||||
#define VIRTUAL_SCREEN_WIDTH (280 * 2)
|
||||
#define VIRTUAL_SCREEN_HEIGHT (192 * 2)
|
||||
|
||||
// Global variables (exported)
|
||||
// Exported functions
|
||||
|
||||
void TogglePalette(void);
|
||||
void CycleScreenTypes(void);
|
||||
void SpawnMessage(const char * text, ...);
|
||||
bool InitVideo(void);
|
||||
void VideoDone(void);
|
||||
void RenderAppleScreen(SDL_Renderer *);
|
||||
void ToggleFullScreen(void);
|
||||
void ToggleTickDisplay(void);
|
||||
|
||||
// Exported variables
|
||||
|
||||
extern bool flash;
|
||||
extern bool textMode;
|
||||
|
|
@ -25,21 +34,5 @@ extern bool col80Mode;
|
|||
extern SDL_Renderer * sdlRenderer;
|
||||
extern SDL_Window * sdlWindow;
|
||||
|
||||
// Functions (exported)
|
||||
|
||||
//void SetupBlurTable(void);
|
||||
void TogglePalette(void);
|
||||
void CycleScreenTypes(void);
|
||||
void SpawnMessage(const char * text, ...);
|
||||
bool InitVideo(void);
|
||||
void VideoDone(void);
|
||||
void RenderAppleScreen(SDL_Renderer *);
|
||||
void ToggleFullScreen(void);
|
||||
void ToggleTickDisplay(void);
|
||||
|
||||
// Exported crap
|
||||
|
||||
//extern uint32_t * scrBuffer;
|
||||
//extern int scrPitch;
|
||||
|
||||
#endif // __VIDEO_H__
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue