The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-23 00:59:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move namespaces to core::

Browse Source
This commit is contained in:
Ryan Teal 2019-06-30 16:00:17 +01:00
parent 2f24f28084
commit 39b591bcfd
No known key found for this signature in database
GPG Key ID: 8DBEE0F12C7E2D23
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/cpp/core/arm/cpu.cpp
View File

@ -1,5 +1,5 @@
#include "cpu.h" #include "cpu.h"
namespace Core { namespace core {
} }

2
app/src/main/cpp/core/arm/cpu.h
View File

@ -2,7 +2,7 @@
#include <unicorn/unicorn.h> #include <unicorn/unicorn.h>
namespace Core { namespace core {
class Cpu { class Cpu {
private: private:
uc_engine *uc; uc_engine *uc;

4
app/src/main/cpp/core/arm/memory.cpp
View File

@ -3,9 +3,9 @@
#include <vector> #include <vector>
#include "memory.h" #include "memory.h"
std::vector<mem::MemoryRegion> memRegions; namespace core::mem {
std::vector<MemoryRegion> memRegions;
namespace mem {
bool Map(uc_engine* uc, uint64_t address, size_t size, std::string label) { bool Map(uc_engine* uc, uint64_t address, size_t size, std::string label) {
void* ptr = mmap((void*)(address), size, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0); void* ptr = mmap((void*)(address), size, PROT_EXEC | PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0);
if(!ptr) if(!ptr)

2
app/src/main/cpp/core/arm/memory.h
View File

@ -4,7 +4,7 @@
#define MEM_BASE 0x80000000 #define MEM_BASE 0x80000000
namespace mem { namespace core::mem {
struct MemoryRegion { struct MemoryRegion {
std::string label; std::string label;
uint64_t address; uint64_t address;

2
app/src/main/cpp/core/hos/loaders/nro.cpp
View File

@ -15,7 +15,7 @@ void ReadDataFromFile(std::string file, char* output, uint32_t offset, size_t si
f.close(); f.close();
} }
namespace loader { namespace core::loader {
bool LoadNro(std::string file) { bool LoadNro(std::string file) {
syslog(LOG_INFO, "Loading NRO file %s\n", file.c_str()); syslog(LOG_INFO, "Loading NRO file %s\n", file.c_str());

2
app/src/main/cpp/core/hos/loaders/nro.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdint> #include <cstdint>
namespace loader { namespace core::loader {
struct NroSegmentHeader { struct NroSegmentHeader {
uint32_t fileOffset; uint32_t fileOffset;
uint32_t size; uint32_t size;