Menu
▾
▴
[openMSX-commits] CVS: openMSX/src Z80Core.nn,NONE,1.1 CPU.hh,1.15,1.16 EmuTime.hh,1.4,1.5 HotKey.cc,1.6,1.7 LoadFile.cc,1.7,1.8 MSXDiskRomPatch.cc,1.9,1.10 MSXMemoryMapper.cc,1.19,1.20 MSXSCCPlusCart.cc,1.4,1.5 Makefile.am,1.92,1.93 Z80.hh,1.28,1.29 msxconfig_config.nn,1.2,1.3 Z80Core.hh,1.6,NONE
|
From: Joost Y. D. <an...@us...> - 2001-12-31 07:18:07
|
Update of /cvsroot/openmsx/openMSX/src
In directory usw-pr-cvs1:/tmp/cvs-serv733/src
Modified Files:
CPU.hh EmuTime.hh HotKey.cc LoadFile.cc MSXDiskRomPatch.cc
MSXMemoryMapper.cc MSXSCCPlusCart.cc Makefile.am Z80.hh
msxconfig_config.nn
Added Files:
Z80Core.nn
Removed Files:
Z80Core.hh
Log Message:
Joost: lots of small C++ standard fixes, src/Z80Core.nn
--- NEW FILE: Z80Core.nn ---
// $Id: Z80Core.nn,v 1.1 2001/12/31 07:18:04 andete Exp $
#ifndef __Z80_HH__
#error please include Z80.hh
#endif
#ifndef __Z80CORE_NN__
#define __Z80CORE_NN__
inline byte Z80_In (word port);
inline void Z80_Out (word port,byte value);
inline byte Z80_RDMEM(word address);
inline void Z80_WRMEM(word address, byte value);
inline byte Z80_RDOP(word A);
inline byte Z80_RDOP_ARG(word A);
inline byte Z80_RDSTACK(word A);
inline void Z80_WRSTACK(word A, byte V);
inline bool M_C();
inline bool M_NC();
[...1185 lines suppressed...]
inline void M_RLC(byte &Reg);
inline void M_RRC(byte &Reg);
inline void M_RL(byte &Reg);
inline void M_RR(byte &Reg);
inline void M_SLL(byte &Reg);
inline void M_SLA(byte &Reg);
inline void M_SRL(byte &Reg);
inline void M_SRA(byte &Reg);
inline void M_INC(byte &Reg);
inline void M_DEC(byte &Reg);
inline void M_ADD(byte Reg);
inline void M_ADC(byte Reg);
inline void M_SUB(byte Reg);
inline void M_SBC(byte Reg);
inline void M_CP(byte Reg);
inline void M_ADDW(word &Reg1, word Reg2);
inline void M_ADCW(word Reg);
inline void M_SBCW(word Reg);
#endif
Index: CPU.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/CPU.hh,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- CPU.hh 2001/12/30 22:38:55 1.15
+++ CPU.hh 2001/12/31 07:18:04 1.16
@@ -14,6 +14,7 @@
class CPU
{
+ public:
#ifndef WORDS_BIGENDIAN
#define LSB_FIRST
#endif
@@ -35,8 +36,6 @@
byte R, R2; // refresh = R&127 | R2&128
};
-
- public:
/**
* Destructor
*/
Index: EmuTime.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/EmuTime.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- EmuTime.hh 2001/12/25 03:27:19 1.4
+++ EmuTime.hh 2001/12/31 07:18:04 1.5
@@ -24,7 +24,7 @@
// constants
static const uint64 MAIN_FREQ = 3579545*24;
- static const uint64 INFINITY = 18446744073709551615ULL; //ULLONG_MAX;
+ static const uint64 INFINITY = 18446744073709551615ULL; //ULLONG_MAX;
// constructors
EmuTime() { time = 0; }
Index: HotKey.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/HotKey.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HotKey.cc 2001/12/03 20:08:17 1.6
+++ HotKey.cc 2001/12/31 07:18:04 1.7
@@ -3,6 +3,7 @@
#include "openmsx.hh"
#include "HotKey.hh"
+#include <iostream>
HotKey::HotKey()
{
Index: LoadFile.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/LoadFile.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LoadFile.cc 2001/12/20 23:16:10 1.7
+++ LoadFile.cc 2001/12/31 07:18:04 1.8
@@ -18,9 +18,9 @@
int LoadFile::loadFile(byte** memoryBank)
{
FILETYPE* file = openFile();
- file->seekg(0,ios::end);
+ file->seekg(0,std::ios::end);
int fileSize=file->tellg();
- file->seekg(0,ios::beg);
+ file->seekg(0,std::ios::beg);
PRT_DEBUG("rom size is determined to be " << fileSize);
readFile(file, fileSize, memoryBank);
return fileSize;
Index: MSXDiskRomPatch.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/MSXDiskRomPatch.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- MSXDiskRomPatch.cc 2001/12/30 21:05:44 1.9
+++ MSXDiskRomPatch.cc 2001/12/31 07:18:04 1.10
@@ -30,9 +30,9 @@
MSXDiskRomPatch::File::File(std::string _filename):filename(_filename)
{
file = new IOFILETYPE(filename.c_str(), IOFILETYPE::out|IOFILETYPE::in);
- file->seekg(0,ios::end);
+ file->seekg(0,std::ios::end);
size=file->tellg();
- file->seekg(0,ios::beg);
+ file->seekg(0,std::ios::beg);
}
MSXDiskRomPatch::File::~File()
@@ -43,7 +43,7 @@
void MSXDiskRomPatch::File::seek(int location)
{
// seek from beginning of file
- file->seekg(location, ios::beg);
+ file->seekg(location, std::ios::beg);
}
void MSXDiskRomPatch::File::read(byte* to, int count)
@@ -58,7 +58,7 @@
bool MSXDiskRomPatch::File::bad()
{
- file->bad();
+ return file->bad();
}
MSXDiskRomPatch::MSXDiskRomPatch()
Index: MSXMemoryMapper.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/MSXMemoryMapper.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- MSXMemoryMapper.cc 2001/12/30 17:27:08 1.19
+++ MSXMemoryMapper.cc 2001/12/31 07:18:04 1.20
@@ -79,7 +79,7 @@
if (device == NULL) {
// Create specified IO behaviour
MSXConfig::Config* config = MSXConfig::instance()->getConfigById("MapperIO");
- string type = config->getParameter("type");
+ std::string type = config->getParameter("type");
if (type == "TurboR")
device = new MSXMapperIOTurboR();
else if (type == "Philips")
Index: MSXSCCPlusCart.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/MSXSCCPlusCart.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MSXSCCPlusCart.cc 2001/12/29 14:24:20 1.4
+++ MSXSCCPlusCart.cc 2001/12/31 07:18:04 1.5
@@ -5,6 +5,7 @@
#include "MSXMotherBoard.hh"
#include "msxconfig.hh"
#include "SCC.hh"
+#include "config.h"
MSXSCCPlusCart::MSXSCCPlusCart(MSXConfig::Device *config, const EmuTime &time)
: MSXDevice(config, time)
@@ -35,11 +36,11 @@
std::ifstream file(filename.c_str());
#endif
// dynamically determine ROM_SIZE if needed
- file.seekg(0,ios::end);
+ file.seekg(0,std::ios::end);
ROM_SIZE=file.tellg();
PRT_DEBUG("SCC+ MegaRom: rom size is " << ROM_SIZE);
- file.seekg(0,ios::beg);
+ file.seekg(0,std::ios::beg);
file.read(memoryBank, ROM_SIZE);
if (file.fail())
PRT_ERROR("Error reading " << filename);
Index: Makefile.am
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- Makefile.am 2001/12/29 18:31:48 1.92
+++ Makefile.am 2001/12/31 07:18:04 1.93
@@ -44,7 +44,7 @@
SDLHiRenderer.hh SDLHiRenderer.cc \
MSXCPU.hh MSXCPU.cc \
CPU.hh CPU.cc CPU.ii CPUInterface.hh CPUInterface.cc \
- Z80.cc Z80.hh Z80.ii opc_R800.h Z80Core.hh \
+ Z80.cc Z80.hh Z80.ii opc_R800.h Z80Core.nn \
Z80Tables.hh Z80Dasm.h \
devicefactory.hh devicefactory.cc \
Scheduler.hh Scheduler.cc \
Index: Z80.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/Z80.hh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Z80.hh 2001/12/30 22:38:55 1.28
+++ Z80.hh 2001/12/31 07:18:04 1.29
@@ -12,8 +12,8 @@
/*** Please, notify me, if you make any changes to this file ***/
/****************************************************************************/
-#ifndef __Z80_H__
-#define __Z80_H__
+#ifndef __Z80_HH__
+#define __Z80_HH__
#include "config.h"
#include "openmsx.hh"
@@ -61,7 +61,7 @@
inline void executeInstruction(byte opcode);
inline void M1Cycle();
- #include "Z80Core.hh"
+ #include "Z80Core.nn"
// flag-register tables
static byte ZSTable[256];
Index: msxconfig_config.nn
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/msxconfig_config.nn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- msxconfig_config.nn 2001/10/21 16:12:15 1.2
+++ msxconfig_config.nn 2001/12/31 07:18:04 1.3
@@ -60,7 +60,7 @@
std::string id, configType, desc, rem;
std::list<Parameter*> parameters;
const Parameter &getParameterByName(const std::string &name);
- list<XMLNode * >* slotted_pass; // hack to pass on slotted to MSXConfig::Device if needed // + another hack cause XMLNodeList is a typedef *sigh*
+ std::list<XMLNode * >* slotted_pass; // hack to pass on slotted to MSXConfig::Device if needed // + another hack cause XMLNodeList is a typedef *sigh*
};
#endif
--- Z80Core.hh DELETED ---
|