Merge branch 'master' into threading

This commit is contained in:
bunnei 2014-05-17 13:35:20 -04:00
commit 3fac6dc39e
8 changed files with 44 additions and 30 deletions

View file

@ -17,12 +17,20 @@ public:
~ARM_Interface() {
}
/**
* Runs the CPU for the given number of instructions
* @param num_instructions Number of instructions to run
*/
void Run(int num_instructions) {
ExecuteInstructions(num_instructions);
m_num_instructions += num_instructions;
}
/// Step CPU by one instruction
void Step() {
ExecuteInstruction();
m_num_instructions++;
Run(1);
}
/**
* Set the Program Counter to an address
* @param addr Address to set PC to
@ -74,8 +82,11 @@ public:
protected:
/// Execture next instruction
virtual void ExecuteInstruction() = 0;
/**
* Executes the given number of instructions
* @param num_instructions Number of instructions to executes
*/
virtual void ExecuteInstructions(int num_instructions) = 0;
private: