ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Fix up headers

This commit is contained in:
zilmar 2015-11-15 14:27:59 +11:00
parent ec31d79c23
commit d7c7882244
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64/N64 System/Mips/Eeprom.h
View File

@ -9,25 +9,24 @@
* * * *
****************************************************************************/ ****************************************************************************/
#pragma once #pragma once
#include <Project64-core/Settings/Debug Settings.h>
class CEeprom : class CEeprom :
private CDebugSettings private CDebugSettings
{ {
public: public:
CEeprom ( bool ReadOnly ); CEeprom(bool ReadOnly);
~CEeprom(); ~CEeprom();
void EepromCommand ( uint8_t * Command ); void EepromCommand(uint8_t * Command);
private: private:
CEeprom(void); // Disable default constructor CEeprom(void); // Disable default constructor
CEeprom(const CEeprom&); // Disable copy constructor CEeprom(const CEeprom&); // Disable copy constructor
CEeprom& operator=(const CEeprom&); // Disable assignment CEeprom& operator=(const CEeprom&); // Disable assignment
void LoadEeprom (); void LoadEeprom();
void ReadFrom ( uint8_t * Buffer, int32_t line ); void ReadFrom(uint8_t * Buffer, int32_t line);
void WriteTo ( uint8_t * Buffer, int32_t line ); void WriteTo(uint8_t * Buffer, int32_t line);
uint8_t m_EEPROM[0x800]; uint8_t m_EEPROM[0x800];
bool m_ReadOnly; bool m_ReadOnly;

11
Source/Project64/N64 System/Recompiler/Code Section.cpp
View File

@ -9,6 +9,16 @@
* * * *
****************************************************************************/ ****************************************************************************/
#include "stdafx.h" #include "stdafx.h"
#include "Code Section.h"
#include <Project64\N64 System\Mips\OpCode.h>
#include <Project64\N64 System\System Globals.h>
#include <Project64\N64 System\Mips\Memory Class.h>
#include <Project64\N64 System\Recompiler\x86CodeLog.h>
#include <Project64\N64 System\Recompiler\Code Block.h>
#include <Project64\N64 System\N64 Class.h>
#include <Project64\N64 System\Interpreter\Interpreter CPU.h>
#include <Project64\N64 System\Recompiler\Loop Analysis.h>
#include <Project64\N64 System\Recompiler\Section Info.h>
void InPermLoop(); void InPermLoop();
@ -442,6 +452,7 @@ void CCodeSection::GenerateSectionLinkage()
// if (g_SyncSystem) { // if (g_SyncSystem) {
MoveConstToX86reg((uint32_t)g_BaseSystem,x86_ECX); MoveConstToX86reg((uint32_t)g_BaseSystem,x86_ECX);
Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem"); Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem");
//}
// MoveConstToVariable(DELAY_SLOT,&m_NextInstruction,"m_NextInstruction"); // MoveConstToVariable(DELAY_SLOT,&m_NextInstruction,"m_NextInstruction");
PushImm32(stdstr_f("0x%08X",CompilePC() + 4).c_str(),CompilePC() + 4); PushImm32(stdstr_f("0x%08X",CompilePC() + 4).c_str(),CompilePC() + 4);