fixed all C++ extra + pedantic errors
This commit is contained in:
@@ -25,7 +25,7 @@ RamMemDevice::RamMemDevice(const char *filename, Size wordSize) :
|
||||
|
||||
if (!input) {
|
||||
cout << "Error reading file \"" << filename << "\" into RamMemDevice.\n";
|
||||
exit(1);
|
||||
std::abort();
|
||||
}
|
||||
|
||||
do { contents.push_back(input.get()); } while (input);
|
||||
@@ -34,11 +34,11 @@ RamMemDevice::RamMemDevice(const char *filename, Size wordSize) :
|
||||
}
|
||||
|
||||
RamMemDevice::RamMemDevice(Size size, Size wordSize) :
|
||||
contents(size), wordSize(wordSize) {}
|
||||
wordSize(wordSize), contents(size) {}
|
||||
|
||||
void RomMemDevice::write(Addr, Word) {
|
||||
cout << "Attempt to write to ROM.\n";
|
||||
exit(1);
|
||||
std::abort();
|
||||
}
|
||||
|
||||
Word RamMemDevice::read(Addr addr) {
|
||||
@@ -216,6 +216,7 @@ void *Harp::consoleInputThread(void* arg_vp) {
|
||||
// }
|
||||
// cout << "Console input ended. Exiting.\n";
|
||||
// exit(4);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// ConsoleMemDevice::ConsoleMemDevice(Size wS, std::ostream &o, Core &core,
|
||||
@@ -246,7 +247,7 @@ Word DiskControllerMemDevice::read(Addr a) {
|
||||
case 5: return status;
|
||||
default:
|
||||
cout << "Attempt to read invalid disk controller register.\n";
|
||||
exit(1);
|
||||
std::abort();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user