Merge branch 'master' into dynapica

This commit is contained in:
wheremyfoodat 2023-06-11 14:43:03 +03:00
commit 315ab1fa16
4 changed files with 40 additions and 5 deletions

View file

@ -95,6 +95,7 @@ namespace KernelMemoryTypes {
class Memory {
u8* fcram;
u8* dspRam;
u8* vram; // Provided to the memory class by the GPU class
u64& cpuTicks; // Reference to the CPU tick counter
using SharedMemoryBlock = KernelMemoryTypes::SharedMemoryBlock;
@ -237,6 +238,7 @@ public:
u8* getDSPMem() { return dspRam; }
u8* getDSPDataMem() { return &dspRam[DSP_DATA_MEMORY_OFFSET]; }
u8* getDSPCodeMem() { return &dspRam[DSP_CODE_MEMORY_OFFSET]; }
u32 getUsedUserMem() { return usedUserMemory; }
void setVRAM(u8* pointer) { vram = pointer; }
};

View file

@ -7,6 +7,7 @@ using namespace Floats;
GPU::GPU(Memory& mem) : mem(mem), renderer(*this, regs) {
vram = new u8[vramSize];
mem.setVRAM(vram); // Give the bus a pointer to our VRAM
}
void GPU::reset() {
@ -275,7 +276,6 @@ void GPU::fireDMA(u32 dest, u32 source, u32 size) {
std::memcpy(&vram[dest - vramStart], &fcram[source - fcramStart], size);
} else {
printf("Non-trivially optimizable GPU DMA. Falling back to byte-by-byte transfer");
std::memcpy(&vram[dest - vramStart], mem.getReadPointer(source), size);
for (u32 i = 0; i < size; i++) {
mem.write8(dest + i, mem.read8(source + i));

View file

@ -5,7 +5,32 @@
namespace fs = std::filesystem;
FSResult SaveDataArchive::createFile(const FSPath& path, u64 size) {
Helpers::panic("[SaveData] CreateFile not yet supported");
if (path.type == PathType::UTF16) {
if (!isPathSafe<PathType::UTF16>(path))
Helpers::panic("Unsafe path in SaveData::CreateFile");
fs::path p = IOFile::getAppData() / "SaveData";
p += fs::path(path.utf16_string).make_preferred();
if (fs::exists(p))
return FSResult::AlreadyExists;
IOFile file(p.string().c_str(), "wb");
// If the size is 0, leave the file empty and return success
if (size == 0) {
return FSResult::Success;
}
// If it is not empty, seek to size - 1 and write a 0 to create a file of size "size"
else if (file.seek(size - 1, SEEK_SET) && file.writeBytes("", 1).second == 1) {
return FSResult::Success;
}
return FSResult::FileTooLarge;
}
Helpers::panic("SaveDataArchive::OpenFile: Failed");
return FSResult::Success;
}
@ -170,4 +195,4 @@ Rust::Result<ArchiveBase*, FSResult> SaveDataArchive::openArchive(const FSPath&
std::optional<u32> SaveDataArchive::readFile(FileSession* file, u64 offset, u32 size, u32 dataPointer) {
Helpers::panic("Unimplemented SaveData::ReadFile");
return 0;
}
}

View file

@ -143,7 +143,15 @@ void Memory::write8(u32 vaddr, u8 value) {
*(u8*)(pointer + offset) = value;
}
else {
Helpers::panic("Unimplemented 8-bit write, addr: %08X, val: %02X", vaddr, value);
// VRAM write
if (vaddr >= VirtualAddrs::VramStart && vaddr < VirtualAddrs::VramStart + VirtualAddrs::VramSize) {
// TODO: Invalidate renderer caches here
vram[vaddr - VirtualAddrs::VramStart] = value;
}
else {
Helpers::panic("Unimplemented 8-bit write, addr: %08X, val: %02X", vaddr, value);
}
}
}