1
0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-19 23:32:28 +00:00

Resolves GCC warnings.

This commit is contained in:
Thomas Harte 2019-11-09 16:12:37 -05:00
parent 5fc4e57db7
commit 0204003680
2 changed files with 3 additions and 3 deletions

View File

@ -182,9 +182,9 @@ class ConcreteMachine:
} }
auto address = cycle.word_address(); auto address = cycle.word_address();
// if(cycle.data_select_active()) printf("%c %06x\n", (cycle.operation & Microcycle::Read) ? 'r' : 'w', *cycle.address & 0xffffff); uint16_t *memory = nullptr;
uint16_t *memory;
switch(memory_map_[address >> 15]) { switch(memory_map_[address >> 15]) {
default:
case BusDevice::MostlyRAM: case BusDevice::MostlyRAM:
if(address < 4) { if(address < 4) {
memory = rom_.data(); memory = rom_.data();

View File

@ -61,7 +61,7 @@ MSA::MSA(const std::string &file_name) :
} }
} }
if(uncompressed_tracks_.size() != (ending_track_ - starting_track_ + 1)*sides_) throw Error::InvalidFormat; if(uncompressed_tracks_.size() != size_t((ending_track_ - starting_track_ + 1)*sides_)) throw Error::InvalidFormat;
} }
std::shared_ptr<::Storage::Disk::Track> MSA::get_track_at_position(::Storage::Disk::Track::Address address) { std::shared_ptr<::Storage::Disk::Track> MSA::get_track_at_position(::Storage::Disk::Track::Address address) {