6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-12 08:30:05 +00:00
Code Issues Projects Releases Wiki Activity
081a2acd61
CLK/Machines/Atari/2600/Cartridges/Pitfall2.hpp

130 lines
4.1 KiB
C++
Raw Normal View History

Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
//
// CartridgePitfall2.h
// Clock Signal
//
// Created by Thomas Harte on 18/03/2017.
Removes all instances of the copyright symbol.
2018-05-13 19:19:52 +00:00
// Copyright 2017 Thomas Harte. All rights reserved.
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
//
#ifndef Atari2600_CartridgePitfall2_hpp
#define Atari2600_CartridgePitfall2_hpp
namespace Atari2600 {
Remove the 6502's use of runtime polymorphism in favour of ordinary templating.
2017-08-16 15:56:52 +00:00
namespace Cartridge {
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
Consequential to the 6502 change, severs the Atari 2600's cartridge container from its former attempt at runtime polymorphism, in favour of each cartridge's specific hardware being defined as a 'bus extender'.
2017-08-16 16:39:15 +00:00
class Pitfall2: public BusExtender {
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
public:
Doubles down on <cX> over <X.h> for C includes, and usage of the namespace for those types and functions.
2017-11-11 20:28:40 +00:00
Pitfall2(uint8_t *rom_base, std::size_t rom_size) :
Consequential to the 6502 change, severs the Atari 2600's cartridge container from its former attempt at runtime polymorphism, in favour of each cartridge's specific hardware being defined as a 'bus extender'.
2017-08-16 16:39:15 +00:00
BusExtender(rom_base, rom_size),
Corrects out-of-order initialisations for the 1770, Atari 2600 joystick, Pitfall II bus extender, Microdisc and 6502.
2017-11-11 03:20:44 +00:00
rom_ptr_(rom_base) {}
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
Corrected TIA's WSYNC lookahead to accept `Cycles`.
2017-07-26 02:13:41 +00:00
void advance_cycles(int cycles) {
Fixed: mistake was failure to count ready cycles.
2017-03-21 00:44:03 +00:00
cycles_since_audio_update_ += cycles;
}
Pulled the 6502 into a CPU namespace, making it an instance of something that has micro-opcodes and schedules them, and factoring out the formulation of a register pair.
2017-05-15 02:08:15 +00:00
void perform_bus_operation(CPU::MOS6502::BusOperation operation, uint16_t address, uint8_t *value) {
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
address &= 0x1fff;
if(!(address & 0x1000)) return;
switch(address) {
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Commutes cross-platform `#pragma mark`s to `//MARK:`s.
2017-11-12 20:59:11 +00:00
// MARK: - Reads
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
// The random number generator
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
case 0x1000: case 0x1001: case 0x1002: case 0x1003: case 0x1004:
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
if(isReadOperation(operation)) {
*value = random_number_generator_;
}
Further doubles down on construction syntax for type conversions.
2020-05-10 03:00:39 +00:00
random_number_generator_ = uint8_t(
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
(random_number_generator_ << 1) |
Fixed 'random' number generator.
2017-03-19 22:54:35 +00:00
(~( (random_number_generator_ >> 7) ^
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
(random_number_generator_ >> 5) ^
(random_number_generator_ >> 4) ^
(random_number_generator_ >> 3)
) & 1));
break;
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
case 0x1005: case 0x1006: case 0x1007:
Made a first, hacky, attempt at audio.
2017-03-20 23:35:51 +00:00
*value = update_audio();
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
break;
Added a slightly faulty but seemingly 'close' version of masking.
2017-03-19 22:28:06 +00:00
case 0x1008: case 0x1009: case 0x100a: case 0x100b: case 0x100c: case 0x100d: case 0x100e: case 0x100f:
Consequential to the 6502 change, severs the Atari 2600's cartridge container from its former attempt at runtime polymorphism, in favour of each cartridge's specific hardware being defined as a 'bus extender'.
2017-08-16 16:39:15 +00:00
*value = rom_base_[8192 + address_for_counter(address & 7)];
Added a slightly faulty but seemingly 'close' version of masking.
2017-03-19 22:28:06 +00:00
break;
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Fixed sprite disappearance: test should be applied predecrement, not post — it relates to the address being used this access, not the next one.
2017-03-19 22:58:35 +00:00
case 0x1010: case 0x1011: case 0x1012: case 0x1013: case 0x1014: case 0x1015: case 0x1016: case 0x1017:
Consequential to the 6502 change, severs the Atari 2600's cartridge container from its former attempt at runtime polymorphism, in favour of each cartridge's specific hardware being defined as a 'bus extender'.
2017-08-16 16:39:15 +00:00
*value = rom_base_[8192 + address_for_counter(address & 7)] & mask_[address & 7];
Fixed sprite disappearance: test should be applied predecrement, not post — it relates to the address being used this access, not the next one.
2017-03-19 22:58:35 +00:00
break;
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Commutes cross-platform `#pragma mark`s to `//MARK:`s.
2017-11-12 20:59:11 +00:00
// MARK: - Writes
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
case 0x1040: case 0x1041: case 0x1042: case 0x1043: case 0x1044: case 0x1045: case 0x1046: case 0x1047:
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
top_[address & 7] = *value;
break;
case 0x1048: case 0x1049: case 0x104a: case 0x104b: case 0x104c: case 0x104d: case 0x104e: case 0x104f:
bottom_[address & 7] = *value;
break;
case 0x1050: case 0x1051: case 0x1052: case 0x1053: case 0x1054: case 0x1055: case 0x1056: case 0x1057:
featcher_address_[address & 7] = (featcher_address_[address & 7] & 0xff00) | *value;
Resetting the mask upon low byte write appears to resolve some issues.
2017-03-19 22:49:37 +00:00
mask_[address & 7] = 0x00;
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
break;
case 0x1058: case 0x1059: case 0x105a: case 0x105b: case 0x105c: case 0x105d: case 0x105e: case 0x105f:
Further doubles down on construction syntax for type conversions.
2020-05-10 03:00:39 +00:00
featcher_address_[address & 7] = (featcher_address_[address & 7] & 0x00ff) | uint16_t(*value << 8);
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
break;
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
case 0x1070: case 0x1071: case 0x1072: case 0x1073: case 0x1074: case 0x1075: case 0x1076: case 0x1077:
random_number_generator_ = 0;
break;
Commutes cross-platform `#pragma mark`s to `//MARK:`s.
2017-11-12 20:59:11 +00:00
// MARK: - Paging
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
Consequential to the 6502 change, severs the Atari 2600's cartridge container from its former attempt at runtime polymorphism, in favour of each cartridge's specific hardware being defined as a 'bus extender'.
2017-08-16 16:39:15 +00:00
case 0x1ff8: rom_ptr_ = rom_base_; break;
case 0x1ff9: rom_ptr_ = rom_base_ + 4096; break;
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
Commutes cross-platform `#pragma mark`s to `//MARK:`s.
2017-11-12 20:59:11 +00:00
// MARK: - Business as usual
Attempted at least to manage appropriate data storage.
2017-03-19 21:31:08 +00:00
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
default:
if(isReadOperation(operation)) {
*value = rom_ptr_[address & 4095];
}
break;
}
}
private:
Added a slightly faulty but seemingly 'close' version of masking.
2017-03-19 22:28:06 +00:00
inline uint16_t address_for_counter(int counter) {
uint16_t fetch_address = (featcher_address_[counter] & 2047) ^ 2047;
if((featcher_address_[counter] & 0xff) == top_[counter]) mask_[counter] = 0xff;
if((featcher_address_[counter] & 0xff) == bottom_[counter]) mask_[counter] = 0x00;
Fixed sprite disappearance: test should be applied predecrement, not post — it relates to the address being used this access, not the next one.
2017-03-19 22:58:35 +00:00
featcher_address_[counter]--;
Added a slightly faulty but seemingly 'close' version of masking.
2017-03-19 22:28:06 +00:00
return fetch_address;
}
Made a first, hacky, attempt at audio.
2017-03-20 23:35:51 +00:00
inline uint8_t update_audio() {
This gives a very noisy version of the real audio.
2017-03-21 00:38:29 +00:00
const unsigned int clock_divisor = 57;
Expands size of storage in Cycles/HalfCycles; adjusts widely to compensate.
2019-10-30 02:36:29 +00:00
int cycles_to_run_for = int(cycles_since_audio_update_.divide(clock_divisor).as_integral());
Made a first, hacky, attempt at audio.
2017-03-20 23:35:51 +00:00
int table_position = 0;
for(int c = 0; c < 3; c++) {
Resolves Clang 13 implicit conversion warnings.
2021-09-24 02:53:41 +00:00
audio_channel_[c] = uint8_t((audio_channel_[c] + cycles_to_run_for) % (1 + top_[5 + c]));
This gives a very noisy version of the real audio.
2017-03-21 00:38:29 +00:00
if((featcher_address_[5 + c] & 0x1000) && ((top_[5 + c] - audio_channel_[c]) > bottom_[5 + c])) {
Made a first, hacky, attempt at audio.
2017-03-20 23:35:51 +00:00
table_position |= 0x4 >> c;
}
}
static uint8_t level_table[8] = { 0x0, 0x4, 0x5, 0x9, 0x6, 0xa, 0xb, 0xf };
return level_table[table_position];
}
Corrects out-of-order initialisations for the 1770, Atari 2600 joystick, Pitfall II bus extender, Microdisc and 6502.
2017-11-11 03:20:44 +00:00
uint16_t featcher_address_[8] = {0, 0, 0, 0, 0, 0, 0, 0};
uint8_t top_[8], bottom_[8], mask_[8] = {0, 0, 0, 0, 0, 0, 0, 0};
uint8_t random_number_generator_ = 0;
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
uint8_t *rom_ptr_;
Made a first, hacky, attempt at audio.
2017-03-20 23:35:51 +00:00
uint8_t audio_channel_[3];
Corrects out-of-order initialisations for the 1770, Atari 2600 joystick, Pitfall II bus extender, Microdisc and 6502.
2017-11-11 03:20:44 +00:00
Cycles cycles_since_audio_update_ = 0;
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
};
Remove the 6502's use of runtime polymorphism in favour of ordinary templating.
2017-08-16 15:56:52 +00:00
}
Added a class to contain the Pitfall 2 pager and a skeleton of initial work.
2017-03-19 02:08:47 +00:00
}
#endif /* Atari2600_CartridgePitfall2_hpp */
Reference in New Issue Copy Permalink