psionrevo
/
WindEmu
mirror of https://github.com/Treeki/WindEmu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flesh out Etna skeleton a bit more

This commit is contained in:
Ash Wolf 2019-12-21 11:09:58 +00:00
parent 0ed437c6d3
commit 868112e9fc
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WindCore/emu.cpp
View File

@ -6,7 +6,7 @@
#define INCLUDE_BANK1 #define INCLUDE_BANK1
Emu::Emu() { Emu::Emu() : etna(this) {
} }

2
WindCore/emu.h
View File

@ -5,6 +5,7 @@
#include <unordered_set> #include <unordered_set>
class Emu { class Emu {
public:
uint8_t ROM[0x1000000]; uint8_t ROM[0x1000000];
uint8_t MemoryBlockC0[0x800000]; uint8_t MemoryBlockC0[0x800000];
uint8_t MemoryBlockC1[0x800000]; uint8_t MemoryBlockC1[0x800000];
@ -12,6 +13,7 @@ class Emu {
uint8_t MemoryBlockD1[0x800000]; uint8_t MemoryBlockD1[0x800000];
enum { MemoryBlockMask = 0x7FFFFF }; enum { MemoryBlockMask = 0x7FFFFF };
private:
uint32_t controlReg; uint32_t controlReg;
uint32_t translationTableBase; uint32_t translationTableBase;
uint32_t domainAccessControl; uint32_t domainAccessControl;

13
WindCore/etna.cpp
View File

@ -1,4 +1,5 @@
#include "etna.h" #include "etna.h"
#include "emu.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -44,7 +45,9 @@ static const char *nameReg(uint32_t reg) {
} }
Etna::Etna() { Etna::Etna(Emu *owner) {
this->owner = owner;
for (int i = 0; i < 0x80; i++) for (int i = 0; i < 0x80; i++)
prom[i] = 0; prom[i] = 0;
@ -77,9 +80,10 @@ Etna::Etna() {
uint32_t Etna::readReg8(uint32_t reg) uint32_t Etna::readReg8(uint32_t reg)
{ {
if (!promReadActive) if (!promReadActive)
printf("ETNA readReg8: reg=%s\n", nameReg(reg)); printf("ETNA readReg8: reg=%s @ pc=%08x,lr=%08x\n", nameReg(reg), owner->getGPR(15) - 4, owner->getGPR(14));
switch (reg) { switch (reg) {
case regSktVarA0: return 0; // will store some status flags case regIntClear: return 0;
case regSktVarA0: return 1; // will store some status flags
case regSktVarA1: return 0; // will store some more status flags case regSktVarA1: return 0; // will store some more status flags
case regWake1: return wake1; case regWake1: return wake1;
case regWake2: return wake2; case regWake2: return wake2;
@ -97,8 +101,9 @@ uint32_t Etna::readReg32(uint32_t reg)
void Etna::writeReg8(uint32_t reg, uint8_t value) void Etna::writeReg8(uint32_t reg, uint8_t value)
{ {
if (!promReadActive) if (!promReadActive)
printf("ETNA writeReg8: reg=%s value=%02x\n", nameReg(reg), value); printf("ETNA writeReg8: reg=%s value=%02x @ pc=%08x,lr=%08x\n", nameReg(reg), value, owner->getGPR(15) - 4, owner->getGPR(14));
switch (reg) { switch (reg) {
case regIntClear: pendingInterrupts &= ~value; break;
case regWake1: wake1 = value; break; case regWake1: wake1 = value; break;
case regWake2: wake2 = value; break; case regWake2: wake2 = value; break;
} }

7
WindCore/etna.h
View File

@ -1,16 +1,21 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
class Emu;
class Etna { class Etna {
uint8_t prom[0x80] = {}; uint8_t prom[0x80] = {};
uint16_t promReadAddress = 0, promReadValue = 0; uint16_t promReadAddress = 0, promReadValue = 0;
bool promReadActive = false; bool promReadActive = false;
int promAddressBitsReceived = 0; int promAddressBitsReceived = 0;
uint8_t pendingInterrupts = 0, interruptMask = 0;
uint8_t wake1 = 0, wake2 = 0; uint8_t wake1 = 0, wake2 = 0;
Emu *owner;
public: public:
Etna(); Etna(Emu *owner);
uint32_t readReg8(uint32_t reg); uint32_t readReg8(uint32_t reg);
uint32_t readReg32(uint32_t reg); uint32_t readReg32(uint32_t reg);

4
WindCore/wind_hw.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "wind.h" #include "wind.h"
#include "arm.h"
#include <stdio.h> #include <stdio.h>
struct Timer { struct Timer {
@ -113,6 +114,9 @@ struct UART {
if (reg == (UART0FCR & 0xFF)) { if (reg == (UART0FCR & 0xFF)) {
return frameControl; return frameControl;
// UART0LCR // UART0LCR
} else if (reg == (UART0FLG & 0xFF)) {
// we pretend we are never busy, never have full fifo
return FlagReceiveFifoEmpty;
} else { } else {
printf("unhandled 32bit uart read %x at pc=%08x lr=%08x\n", reg, cpu->gprs[ARM_PC], cpu->gprs[ARM_LR]); printf("unhandled 32bit uart read %x at pc=%08x lr=%08x\n", reg, cpu->gprs[ARM_PC], cpu->gprs[ARM_LR]);
return 0xFFFFFFFF; return 0xFFFFFFFF;