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

moved hw and hle code to guest

This commit is contained in:
Anthony Pesch 2017-06-12 20:09:52 -04:00
parent ee72f97636
commit d4a4f0bb2a
69 changed files with 189 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
CMakeLists.txt
View File

@ -158,8 +158,6 @@ endif()
#-------------------------------------------------- #--------------------------------------------------
set(REDREAM_SOURCES set(REDREAM_SOURCES
src/bios/bios.c
src/bios/flash.c
src/core/assert.c src/core/assert.c
src/core/exception_handler.c src/core/exception_handler.c
src/core/filesystem.c src/core/filesystem.c
@ -174,29 +172,35 @@ set(REDREAM_SOURCES
src/core/rb_tree.c src/core/rb_tree.c
src/core/sort.c src/core/sort.c
src/core/string.c src/core/string.c
src/guest/aica/aica.c
src/guest/arm7/arm7.c
src/guest/bios/bios.c
src/guest/bios/flash.c
src/guest/gdrom/cdi.c
src/guest/gdrom/disc.c
src/guest/gdrom/gdi.c
src/guest/gdrom/gdrom.c
src/guest/holly/holly.c
src/guest/maple/controller.c
src/guest/maple/maple.c
src/guest/maple/vmu.c
src/guest/pvr/pvr.c
src/guest/pvr/ta.c
src/guest/pvr/tr.c
src/guest/pvr/trace.c
src/guest/rom/boot.c
src/guest/rom/flash.c
src/guest/sh4/sh4.c
src/guest/sh4/sh4_ccn.c
src/guest/sh4/sh4_dbg.c
src/guest/sh4/sh4_dmac.c
src/guest/sh4/sh4_intc.c
src/guest/sh4/sh4_tmu.c
src/guest/debugger.c
src/guest/dreamcast.c
src/guest/memory.c
src/guest/scheduler.c
src/host/keycode.c src/host/keycode.c
src/hw/aica/aica.c
src/hw/arm7/arm7.c
src/hw/gdrom/cdi.c
src/hw/gdrom/disc.c
src/hw/gdrom/gdi.c
src/hw/gdrom/gdrom.c
src/hw/holly/holly.c
src/hw/maple/controller.c
src/hw/maple/maple.c
src/hw/maple/vmu.c
src/hw/pvr/pvr.c
src/hw/pvr/ta.c
src/hw/pvr/tr.c
src/hw/pvr/trace.c
src/hw/rom/boot.c
src/hw/rom/flash.c
src/hw/sh4/sh4.c
src/hw/sh4/sh4_ccn.c
src/hw/sh4/sh4_dbg.c
src/hw/sh4/sh4_dmac.c
src/hw/sh4/sh4_intc.c
src/hw/sh4/sh4_tmu.c
src/jit/backend/interp/interp_backend.c src/jit/backend/interp/interp_backend.c
src/jit/frontend/armv3/armv3_context.c src/jit/frontend/armv3/armv3_context.c
src/jit/frontend/armv3/armv3_disasm.c src/jit/frontend/armv3/armv3_disasm.c
@ -221,11 +225,7 @@ set(REDREAM_SOURCES
src/render/gl_backend.c src/render/gl_backend.c
src/render/imgui.cc src/render/imgui.cc
src/render/microprofile.cc src/render/microprofile.cc
src/debugger.c
src/dreamcast.c
src/emulator.c src/emulator.c
src/memory.c
src/scheduler.c
src/tracer.c src/tracer.c
) )

28
src/emulator.c
View File

@ -12,28 +12,28 @@
*/ */
#include "emulator.h" #include "emulator.h"
#include "bios/bios.h"
#include "core/option.h" #include "core/option.h"
#include "core/profiler.h" #include "core/profiler.h"
#include "core/thread.h" #include "core/thread.h"
#include "core/time.h" #include "core/time.h"
#include "dreamcast.h" #include "guest/aica/aica.h"
#include "guest/arm7/arm7.h"
#include "guest/bios/bios.h"
#include "guest/dreamcast.h"
#include "guest/gdrom/gdrom.h"
#include "guest/holly/holly.h"
#include "guest/maple/maple.h"
#include "guest/memory.h"
#include "guest/pvr/pvr.h"
#include "guest/pvr/ta.h"
#include "guest/pvr/tr.h"
#include "guest/pvr/trace.h"
#include "guest/scheduler.h"
#include "guest/sh4/sh4.h"
#include "host/host.h" #include "host/host.h"
#include "hw/aica/aica.h"
#include "hw/arm7/arm7.h"
#include "hw/gdrom/gdrom.h"
#include "hw/holly/holly.h"
#include "hw/maple/maple.h"
#include "hw/pvr/pvr.h"
#include "hw/pvr/ta.h"
#include "hw/pvr/tr.h"
#include "hw/pvr/trace.h"
#include "hw/sh4/sh4.h"
#include "memory.h"
#include "render/imgui.h" #include "render/imgui.h"
#include "render/microprofile.h" #include "render/microprofile.h"
#include "render/render_backend.h" #include "render/render_backend.h"
#include "scheduler.h"
DEFINE_AGGREGATE_COUNTER(frames); DEFINE_AGGREGATE_COUNTER(frames);

16
src/hw/aica/aica.c → src/guest/aica/aica.c
View File

@ -1,17 +1,17 @@
#include "hw/aica/aica.h" #include "guest/aica/aica.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/log.h" #include "core/log.h"
#include "core/math.h" #include "core/math.h"
#include "core/option.h" #include "core/option.h"
#include "core/profiler.h" #include "core/profiler.h"
#include "dreamcast.h" #include "guest/aica/aica_types.h"
#include "hw/aica/aica_types.h" #include "guest/arm7/arm7.h"
#include "hw/arm7/arm7.h" #include "guest/dreamcast.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "hw/sh4/sh4.h" #include "guest/memory.h"
#include "memory.h" #include "guest/scheduler.h"
#include "guest/sh4/sh4.h"
#include "render/imgui.h" #include "render/imgui.h"
#include "scheduler.h"
DEFINE_AGGREGATE_COUNTER(aica_samples); DEFINE_AGGREGATE_COUNTER(aica_samples);

2
src/hw/aica/aica.h → src/guest/aica/aica.h
View File

@ -1,7 +1,7 @@
#ifndef AICA_H #ifndef AICA_H
#define AICA_H #define AICA_H
#include "memory.h" #include "guest/memory.h"
struct aica; struct aica;
struct dreamcast; struct dreamcast;

0
src/hw/aica/aica_types.h → src/guest/aica/aica_types.h
View File

8
src/hw/arm7/arm7.c → src/guest/arm7/arm7.c
View File

@ -1,14 +1,14 @@
#include "hw/arm7/arm7.h" #include "guest/arm7/arm7.h"
#include "core/log.h" #include "core/log.h"
#include "dreamcast.h" #include "guest/aica/aica.h"
#include "hw/aica/aica.h" #include "guest/dreamcast.h"
#include "guest/scheduler.h"
#include "jit/frontend/armv3/armv3_context.h" #include "jit/frontend/armv3/armv3_context.h"
#include "jit/frontend/armv3/armv3_fallback.h" #include "jit/frontend/armv3/armv3_fallback.h"
#include "jit/frontend/armv3/armv3_frontend.h" #include "jit/frontend/armv3/armv3_frontend.h"
#include "jit/frontend/armv3/armv3_guest.h" #include "jit/frontend/armv3/armv3_guest.h"
#include "jit/ir/ir.h" #include "jit/ir/ir.h"
#include "jit/jit.h" #include "jit/jit.h"
#include "scheduler.h"
#if ARCH_X64 #if ARCH_X64
#include "jit/backend/x64/x64_backend.h" #include "jit/backend/x64/x64_backend.h"

2
src/hw/arm7/arm7.h → src/guest/arm7/arm7.h
View File

@ -2,7 +2,7 @@
#define ARM7_H #define ARM7_H
#include "core/profiler.h" #include "core/profiler.h"
#include "memory.h" #include "guest/memory.h"
struct arm7; struct arm7;
struct dreamcast; struct dreamcast;

10
src/bios/bios.c → src/guest/bios/bios.c
View File

@ -1,11 +1,11 @@
#include <time.h> #include <time.h>
#include "bios/bios.h" #include "guest/bios/bios.h"
#include "bios/flash.h"
#include "core/math.h" #include "core/math.h"
#include "core/option.h" #include "core/option.h"
#include "dreamcast.h" #include "guest/aica/aica.h"
#include "hw/aica/aica.h" #include "guest/bios/flash.h"
#include "hw/rom/flash.h" #include "guest/dreamcast.h"
#include "guest/rom/flash.h"
#include "render/imgui.h" #include "render/imgui.h"
DEFINE_OPTION_STRING(region, "america", "System region"); DEFINE_OPTION_STRING(region, "america", "System region");

0
src/bios/bios.h → src/guest/bios/bios.h
View File

4
src/bios/flash.c → src/guest/bios/flash.c
View File

@ -2,9 +2,9 @@
* high-level code for working with the system's flash memory * high-level code for working with the system's flash memory
*/ */
#include "bios/flash.h" #include "guest/bios/flash.h"
#include "core/math.h" #include "core/math.h"
#include "hw/rom/flash.h" #include "guest/rom/flash.h"
#define FLASH_BLOCK_SIZE 0x40 #define FLASH_BLOCK_SIZE 0x40

2
src/bios/flash.h → src/guest/bios/flash.h
View File

@ -1,7 +1,7 @@
#ifndef FLASH_H #ifndef FLASH_H
#define FLASH_H #define FLASH_H
#include "bios/flash_types.h" #include "guest/bios/flash_types.h"
struct flash; struct flash;

0
src/bios/flash_types.h → src/guest/bios/flash_types.h
View File

4
src/debugger.c → src/guest/debugger.c
View File

@ -3,8 +3,8 @@
#include "gdb/gdb_server.h" #include "gdb/gdb_server.h"
#include "core/log.h" #include "core/log.h"
#include "debugger.h" #include "guest/debugger.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
struct debugger { struct debugger {
struct dreamcast *dc; struct dreamcast *dc;

0
src/debugger.h → src/guest/debugger.h
View File

30
src/dreamcast.c → src/guest/dreamcast.c
View File

@ -1,20 +1,20 @@
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "bios/bios.h"
#include "core/option.h" #include "core/option.h"
#include "core/string.h" #include "core/string.h"
#include "debugger.h" #include "guest/aica/aica.h"
#include "hw/aica/aica.h" #include "guest/arm7/arm7.h"
#include "hw/arm7/arm7.h" #include "guest/bios/bios.h"
#include "hw/gdrom/gdrom.h" #include "guest/debugger.h"
#include "hw/holly/holly.h" #include "guest/gdrom/gdrom.h"
#include "hw/maple/maple.h" #include "guest/holly/holly.h"
#include "hw/pvr/pvr.h" #include "guest/maple/maple.h"
#include "hw/pvr/ta.h" #include "guest/memory.h"
#include "hw/rom/boot.h" #include "guest/pvr/pvr.h"
#include "hw/rom/flash.h" #include "guest/pvr/ta.h"
#include "hw/sh4/sh4.h" #include "guest/rom/boot.h"
#include "memory.h" #include "guest/rom/flash.h"
#include "scheduler.h" #include "guest/scheduler.h"
#include "guest/sh4/sh4.h"
void dc_poll_input(struct dreamcast *dc) { void dc_poll_input(struct dreamcast *dc) {
if (!dc->poll_input) { if (!dc->poll_input) {

2
src/dreamcast.h → src/guest/dreamcast.h
View File

@ -4,8 +4,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "core/list.h" #include "core/list.h"
#include "guest/memory.h"
#include "host/keycode.h" #include "host/keycode.h"
#include "memory.h"
struct aica; struct aica;
struct arm7; struct arm7;

4
src/hw/gdrom/cdi.c → src/guest/gdrom/cdi.c
View File

@ -1,6 +1,6 @@
#include "core/assert.h" #include "core/assert.h"
#include "hw/gdrom/disc.h" #include "guest/gdrom/disc.h"
#include "hw/gdrom/gdrom_types.h" #include "guest/gdrom/gdrom_types.h"
#define CDI_V2 0x80000004 #define CDI_V2 0x80000004
#define CDI_V3 0x80000005 #define CDI_V3 0x80000005

0
src/hw/gdrom/cdi.h → src/guest/gdrom/cdi.h
View File

6
src/hw/gdrom/disc.c → src/guest/gdrom/disc.c
View File

@ -1,7 +1,7 @@
#include "hw/gdrom/disc.h" #include "guest/gdrom/disc.h"
#include "core/string.h" #include "core/string.h"
#include "hw/gdrom/cdi.h" #include "guest/gdrom/cdi.h"
#include "hw/gdrom/gdi.h" #include "guest/gdrom/gdi.h"
struct track *disc_lookup_track(struct disc *disc, int fad) { struct track *disc_lookup_track(struct disc *disc, int fad) {
int num_tracks = disc_get_num_tracks(disc); int num_tracks = disc_get_num_tracks(disc);

2
src/hw/gdrom/disc.h → src/guest/gdrom/disc.h
View File

@ -2,7 +2,7 @@
#define DISC_H #define DISC_H
#include "core/filesystem.h" #include "core/filesystem.h"
#include "hw/gdrom/gdrom_types.h" #include "guest/gdrom/gdrom_types.h"
#define DISC_MAX_SECTOR_SIZE 2352 #define DISC_MAX_SECTOR_SIZE 2352
#define DISC_MAX_SESSIONS 2 #define DISC_MAX_SESSIONS 2

4
src/hw/gdrom/gdi.c → src/guest/gdrom/gdi.c
View File

@ -1,6 +1,6 @@
#include "hw/gdrom/gdi.h" #include "guest/gdrom/gdi.h"
#include "core/assert.h" #include "core/assert.h"
#include "hw/gdrom/disc.h" #include "guest/gdrom/disc.h"
struct gdi { struct gdi {
struct disc; struct disc;

0
src/hw/gdrom/gdi.h → src/guest/gdrom/gdi.h
View File

10
src/hw/gdrom/gdrom.c → src/guest/gdrom/gdrom.c
View File

@ -1,10 +1,10 @@
#include "hw/gdrom/gdrom.h" #include "guest/gdrom/gdrom.h"
#include "core/math.h" #include "core/math.h"
#include "core/string.h" #include "core/string.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/gdrom/gdrom_replies.inc" #include "guest/gdrom/gdrom_replies.inc"
#include "hw/gdrom/gdrom_types.h" #include "guest/gdrom/gdrom_types.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#if 0 #if 0
#define LOG_GDROM LOG_INFO #define LOG_GDROM LOG_INFO

4
src/hw/gdrom/gdrom.h → src/guest/gdrom/gdrom.h
View File

@ -1,8 +1,8 @@
#ifndef GDROM_H #ifndef GDROM_H
#define GDROM_H #define GDROM_H
#include "hw/gdrom/disc.h" #include "guest/gdrom/disc.h"
#include "hw/gdrom/gdrom_types.h" #include "guest/gdrom/gdrom_types.h"
struct dreamcast; struct dreamcast;
struct gdrom; struct gdrom;

0
src/hw/gdrom/gdrom_replies.inc → src/guest/gdrom/gdrom_replies.inc
View File

0
src/hw/gdrom/gdrom_types.h → src/guest/gdrom/gdrom_types.h
View File

14
src/hw/holly/holly.c → src/guest/holly/holly.c
View File

@ -1,10 +1,10 @@
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/gdrom/gdrom.h" #include "guest/gdrom/gdrom.h"
#include "hw/maple/maple.h" #include "guest/maple/maple.h"
#include "hw/sh4/sh4.h" #include "guest/scheduler.h"
#include "guest/sh4/sh4.h"
#include "render/imgui.h" #include "render/imgui.h"
#include "scheduler.h"
struct reg_cb holly_cb[NUM_HOLLY_REGS]; struct reg_cb holly_cb[NUM_HOLLY_REGS];
@ -363,7 +363,7 @@ struct holly *holly_create(struct dreamcast *dc) {
#define HOLLY_REG(addr, name, default, type) \ #define HOLLY_REG(addr, name, default, type) \
hl->reg[name] = default; \ hl->reg[name] = default; \
hl->name = (type *)&hl->reg[name]; hl->name = (type *)&hl->reg[name];
#include "hw/holly/holly_regs.inc" #include "guest/holly/holly_regs.inc"
#undef HOLLY_REG #undef HOLLY_REG
return hl; return hl;

8
src/hw/holly/holly.h → src/guest/holly/holly.h
View File

@ -1,9 +1,9 @@
#ifndef HOLLY_H #ifndef HOLLY_H
#define HOLLY_H #define HOLLY_H
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/holly/holly_types.h" #include "guest/holly/holly_types.h"
#include "memory.h" #include "guest/memory.h"
struct gdrom; struct gdrom;
struct maple; struct maple;
@ -14,7 +14,7 @@ struct holly {
uint32_t reg[NUM_HOLLY_REGS]; uint32_t reg[NUM_HOLLY_REGS];
#define HOLLY_REG(offset, name, default, type) type *name; #define HOLLY_REG(offset, name, default, type) type *name;
#include "hw/holly/holly_regs.inc" #include "guest/holly/holly_regs.inc"
#undef HOLLY_REG #undef HOLLY_REG
/* debug */ /* debug */

0
src/hw/holly/holly_regs.inc → src/guest/holly/holly_regs.inc
View File

2
src/hw/holly/holly_types.h → src/guest/holly/holly_types.h
View File

@ -6,7 +6,7 @@
/* registers */ /* registers */
enum { enum {
#define HOLLY_REG(addr, name, flags, default) name = (addr - 0x005f0000) >> 2, #define HOLLY_REG(addr, name, flags, default) name = (addr - 0x005f0000) >> 2,
#include "hw/holly/holly_regs.inc" #include "guest/holly/holly_regs.inc"
#undef HOLLY_REG #undef HOLLY_REG
NUM_HOLLY_REGS = 0x00008000 >> 2, NUM_HOLLY_REGS = 0x00008000 >> 2,
}; };

4
src/hw/maple/controller.c → src/guest/maple/controller.c
View File

@ -1,7 +1,7 @@
#include "core/option.h" #include "core/option.h"
#include "core/string.h" #include "core/string.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/maple/maple.h" #include "guest/maple/maple.h"
enum { enum {
CONT_C, CONT_C,

8
src/hw/maple/maple.c → src/guest/maple/maple.c
View File

@ -1,7 +1,7 @@
#include "hw/maple/maple.h" #include "guest/maple/maple.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
struct maple { struct maple {
struct device; struct device;

2
src/hw/maple/maple.h → src/guest/maple/maple.h
View File

@ -1,7 +1,7 @@
#ifndef MAPLE_H #ifndef MAPLE_H
#define MAPLE_H #define MAPLE_H
#include "hw/maple/maple_types.h" #include "guest/maple/maple_types.h"
struct dreamcast; struct dreamcast;
struct maple; struct maple;

0
src/hw/maple/maple_types.h → src/guest/maple/maple_types.h
View File

4
src/hw/maple/vmu.c → src/guest/maple/vmu.c
View File

@ -1,8 +1,8 @@
#include "core/assert.h" #include "core/assert.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/string.h" #include "core/string.h"
#include "hw/maple/maple.h" #include "guest/maple/maple.h"
#include "hw/maple/vmu_default.inc" #include "guest/maple/vmu_default.inc"
#define VMU_BLOCK_SIZE 512 #define VMU_BLOCK_SIZE 512
#define VMU_BLOCK_WORDS (512 >> 2) #define VMU_BLOCK_WORDS (512 >> 2)

0
src/hw/maple/vmu_default.inc → src/guest/maple/vmu_default.inc
View File

4
src/memory.c → src/guest/memory.c
View File

@ -1,8 +1,8 @@
#include "memory.h" #include "guest/memory.h"
#include "core/exception_handler.h" #include "core/exception_handler.h"
#include "core/math.h" #include "core/math.h"
#include "core/string.h" #include "core/string.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
/* /*
* address maps * address maps

0
src/memory.h → src/guest/memory.h
View File

0
src/hw/pvr/pixel_convert.h → src/guest/pvr/pixel_convert.h
View File

14
src/hw/pvr/pvr.c → src/guest/pvr/pvr.c
View File

@ -1,10 +1,10 @@
#include "hw/pvr/pvr.h" #include "guest/pvr/pvr.h"
#include "core/time.h" #include "core/time.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "hw/pvr/ta.h" #include "guest/pvr/ta.h"
#include "hw/sh4/sh4.h" #include "guest/scheduler.h"
#include "scheduler.h" #include "guest/sh4/sh4.h"
DEFINE_AGGREGATE_COUNTER(pvr_vblanks); DEFINE_AGGREGATE_COUNTER(pvr_vblanks);
DEFINE_AGGREGATE_COUNTER(pvr_vram_data); DEFINE_AGGREGATE_COUNTER(pvr_vram_data);
@ -219,7 +219,7 @@ static int pvr_init(struct device *dev) {
#define PVR_REG(offset, name, default, type) \ #define PVR_REG(offset, name, default, type) \
pvr->reg[name] = default; \ pvr->reg[name] = default; \
pvr->name = (type *)&pvr->reg[name]; pvr->name = (type *)&pvr->reg[name];
#include "hw/pvr/pvr_regs.inc" #include "guest/pvr/pvr_regs.inc"
#undef PVR_REG #undef PVR_REG
pvr->palette_ram = (uint8_t *)pvr->PALETTE_RAM000; pvr->palette_ram = (uint8_t *)pvr->PALETTE_RAM000;

8
src/hw/pvr/pvr.h → src/guest/pvr/pvr.h
View File

@ -2,9 +2,9 @@
#define PVR_H #define PVR_H
#include "core/profiler.h" #include "core/profiler.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/pvr/pvr_types.h" #include "guest/memory.h"
#include "memory.h" #include "guest/pvr/pvr_types.h"
struct dreamcast; struct dreamcast;
struct holly; struct holly;
@ -22,7 +22,7 @@ struct pvr {
uint32_t current_line; uint32_t current_line;
#define PVR_REG(offset, name, default, type) type *name; #define PVR_REG(offset, name, default, type) type *name;
#include "hw/pvr/pvr_regs.inc" #include "guest/pvr/pvr_regs.inc"
#undef PVR_REG #undef PVR_REG
}; };

0
src/hw/pvr/pvr_regs.inc → src/guest/pvr/pvr_regs.inc
View File

2
src/hw/pvr/pvr_types.h → src/guest/pvr/pvr_types.h
View File

@ -228,7 +228,7 @@ union ta_yuv_tex_cnt {
enum { enum {
#define PVR_REG(addr, name, flags, default_value) \ #define PVR_REG(addr, name, flags, default_value) \
name = (addr - 0x005f8000) >> 2, name = (addr - 0x005f8000) >> 2,
#include "hw/pvr/pvr_regs.inc" #include "guest/pvr/pvr_regs.inc"
#undef PVR_REG #undef PVR_REG
PVR_NUM_REGS = 0x00002000 >> 2, PVR_NUM_REGS = 0x00002000 >> 2,
}; };

14
src/hw/pvr/ta.c → src/guest/pvr/ta.c
View File

@ -1,14 +1,14 @@
#include "hw/pvr/ta.h" #include "guest/pvr/ta.h"
#include "core/exception_handler.h" #include "core/exception_handler.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/list.h" #include "core/list.h"
#include "core/string.h" #include "core/string.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "hw/pvr/pixel_convert.h" #include "guest/pvr/pixel_convert.h"
#include "hw/pvr/pvr.h" #include "guest/pvr/pvr.h"
#include "hw/pvr/tr.h" #include "guest/pvr/tr.h"
#include "hw/sh4/sh4.h" #include "guest/scheduler.h"
#include "scheduler.h" #include "guest/sh4/sh4.h"
DEFINE_AGGREGATE_COUNTER(ta_data); DEFINE_AGGREGATE_COUNTER(ta_data);
DEFINE_AGGREGATE_COUNTER(ta_renders); DEFINE_AGGREGATE_COUNTER(ta_renders);

4
src/hw/pvr/ta.h → src/guest/pvr/ta.h
View File

@ -2,8 +2,8 @@
#define TA_H #define TA_H
#include "core/profiler.h" #include "core/profiler.h"
#include "hw/pvr/ta_types.h" #include "guest/memory.h"
#include "memory.h" #include "guest/pvr/ta_types.h"
struct dreamcast; struct dreamcast;
struct ta; struct ta;

0
src/hw/pvr/ta_types.h → src/guest/pvr/ta_types.h
View File

6
src/hw/pvr/tr.c → src/guest/pvr/tr.c
View File

@ -1,11 +1,11 @@
#include "hw/pvr/tr.h" #include "guest/pvr/tr.h"
#include "core/assert.h" #include "core/assert.h"
#include "core/core.h" #include "core/core.h"
#include "core/math.h" #include "core/math.h"
#include "core/profiler.h" #include "core/profiler.h"
#include "core/sort.h" #include "core/sort.h"
#include "hw/pvr/pixel_convert.h" #include "guest/pvr/pixel_convert.h"
#include "hw/pvr/ta.h" #include "guest/pvr/ta.h"
struct tr { struct tr {
struct render_backend *r; struct render_backend *r;

2
src/hw/pvr/tr.h → src/guest/pvr/tr.h
View File

@ -5,7 +5,7 @@
draw commands to be passed to the supplied render backend */ draw commands to be passed to the supplied render backend */
#include "core/rb_tree.h" #include "core/rb_tree.h"
#include "hw/pvr/ta_types.h" #include "guest/pvr/ta_types.h"
#include "render/render_backend.h" #include "render/render_backend.h"
struct tr; struct tr;

4
src/hw/pvr/trace.c → src/guest/pvr/trace.c
View File

@ -1,9 +1,9 @@
#include <limits.h> #include <limits.h>
#include "hw/pvr/trace.h" #include "guest/pvr/trace.h"
#include "core/assert.h" #include "core/assert.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/math.h" #include "core/math.h"
#include "hw/pvr/tr.h" #include "guest/pvr/tr.h"
void get_next_trace_filename(char *filename, size_t size) { void get_next_trace_filename(char *filename, size_t size) {
const char *appdir = fs_appdir(); const char *appdir = fs_appdir();

2
src/hw/pvr/trace.h → src/guest/pvr/trace.h
View File

@ -2,7 +2,7 @@
#define TRACE_H #define TRACE_H
#include <stdio.h> #include <stdio.h>
#include "hw/pvr/ta_types.h" #include "guest/pvr/ta_types.h"
enum trace_cmd_type { enum trace_cmd_type {
TRACE_CMD_NONE, TRACE_CMD_NONE,

6
src/hw/rom/boot.c → src/guest/rom/boot.c
View File

@ -1,8 +1,8 @@
#include "hw/rom/boot.h" #include "guest/rom/boot.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/md5.h" #include "core/md5.h"
#include "core/option.h" #include "core/option.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
DEFINE_OPTION_STRING(bios, "dc_boot.bin", "Path to boot rom"); DEFINE_OPTION_STRING(bios, "dc_boot.bin", "Path to boot rom");
@ -45,6 +45,7 @@ static int boot_load_rom(struct boot *boot) {
FILE *fp = fopen(filename, "rb"); FILE *fp = fopen(filename, "rb");
if (!fp) { if (!fp) {
LOG_WARNING("failed to open %s", filename);
return 0; return 0;
} }
@ -75,7 +76,6 @@ static int boot_init(struct device *dev) {
struct boot *boot = (struct boot *)dev; struct boot *boot = (struct boot *)dev;
if (!boot_load_rom(boot)) { if (!boot_load_rom(boot)) {
LOG_WARNING("failed to load boot rom");
return 0; return 0;
} }

2
src/hw/rom/boot.h → src/guest/rom/boot.h
View File

@ -1,7 +1,7 @@
#ifndef BOOT_H #ifndef BOOT_H
#define BOOT_H #define BOOT_H
#include "memory.h" #include "guest/memory.h"
struct dreamcast; struct dreamcast;
struct boot; struct boot;

4
src/hw/rom/flash.c → src/guest/rom/flash.c
View File

@ -1,8 +1,8 @@
#include <stdio.h> #include <stdio.h>
#include "hw/rom/flash.h" #include "guest/rom/flash.h"
#include "core/filesystem.h" #include "core/filesystem.h"
#include "core/option.h" #include "core/option.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#define FLASH_SIZE 0x00020000 #define FLASH_SIZE 0x00020000
#define FLASH_SECTOR_SIZE 0x4000 #define FLASH_SECTOR_SIZE 0x4000

2
src/hw/rom/flash.h → src/guest/rom/flash.h
View File

@ -1,7 +1,7 @@
#ifndef FLASHROM_H #ifndef FLASHROM_H
#define FLASHROM_H #define FLASHROM_H
#include "memory.h" #include "guest/memory.h"
struct dreamcast; struct dreamcast;
struct flash; struct flash;

4
src/scheduler.c → src/guest/scheduler.c
View File

@ -1,9 +1,9 @@
#include <stdio.h> #include <stdio.h>
#include "scheduler.h" #include "guest/scheduler.h"
#include "core/assert.h" #include "core/assert.h"
#include "core/core.h" #include "core/core.h"
#include "core/list.h" #include "core/list.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#define MAX_TIMERS 128 #define MAX_TIMERS 128

0
src/scheduler.h → src/guest/scheduler.h
View File

22
src/hw/sh4/sh4.c → src/guest/sh4/sh4.c
View File

@ -1,21 +1,21 @@
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
#include "core/math.h" #include "core/math.h"
#include "core/string.h" #include "core/string.h"
#include "core/time.h" #include "core/time.h"
#include "dreamcast.h" #include "guest/aica/aica.h"
#include "hw/aica/aica.h" #include "guest/dreamcast.h"
#include "hw/holly/holly.h" #include "guest/holly/holly.h"
#include "hw/pvr/pvr.h" #include "guest/memory.h"
#include "hw/pvr/ta.h" #include "guest/pvr/pvr.h"
#include "hw/rom/boot.h" #include "guest/pvr/ta.h"
#include "hw/rom/flash.h" #include "guest/rom/boot.h"
#include "guest/rom/flash.h"
#include "guest/scheduler.h"
#include "jit/frontend/sh4/sh4_fallback.h" #include "jit/frontend/sh4/sh4_fallback.h"
#include "jit/frontend/sh4/sh4_frontend.h" #include "jit/frontend/sh4/sh4_frontend.h"
#include "jit/frontend/sh4/sh4_guest.h" #include "jit/frontend/sh4/sh4_guest.h"
#include "jit/jit.h" #include "jit/jit.h"
#include "memory.h"
#include "render/imgui.h" #include "render/imgui.h"
#include "scheduler.h"
#if ARCH_X64 #if ARCH_X64
#include "jit/backend/x64/x64_backend.h" #include "jit/backend/x64/x64_backend.h"
@ -195,7 +195,7 @@ void sh4_reset(struct sh4 *sh4, uint32_t pc) {
#define SH4_REG(addr, name, default, type) \ #define SH4_REG(addr, name, default, type) \
sh4->reg[name] = default; \ sh4->reg[name] = default; \
sh4->name = (type *)&sh4->reg[name]; sh4->name = (type *)&sh4->reg[name];
#include "hw/sh4/sh4_regs.inc" #include "guest/sh4/sh4_regs.inc"
#undef SH4_REG #undef SH4_REG
/* reset interrupts */ /* reset interrupts */

8
src/hw/sh4/sh4.h → src/guest/sh4/sh4.h
View File

@ -2,11 +2,11 @@
#define SH4_H #define SH4_H
#include "core/profiler.h" #include "core/profiler.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/sh4/sh4_types.h" #include "guest/memory.h"
#include "guest/sh4/sh4_types.h"
#include "jit/frontend/sh4/sh4_context.h" #include "jit/frontend/sh4/sh4_context.h"
#include "jit/jit.h" #include "jit/jit.h"
#include "memory.h"
struct dreamcast; struct dreamcast;
struct jit; struct jit;
@ -42,7 +42,7 @@ struct sh4 {
struct sh4_context ctx; struct sh4_context ctx;
uint32_t reg[NUM_SH4_REGS]; uint32_t reg[NUM_SH4_REGS];
#define SH4_REG(addr, name, default, type) type *name; #define SH4_REG(addr, name, default, type) type *name;
#include "hw/sh4/sh4_regs.inc" #include "guest/sh4/sh4_regs.inc"
#undef SH4_REG #undef SH4_REG
/* jit */ /* jit */

2
src/hw/sh4/sh4_ccn.c → src/guest/sh4/sh4_ccn.c
View File

@ -1,4 +1,4 @@
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
#include "jit/jit.h" #include "jit/jit.h"
/* with OIX, bit 25, rather than bit 13, determines which 4kb bank to use */ /* with OIX, bit 25, rather than bit 13, determines which 4kb bank to use */

4
src/hw/sh4/sh4_dbg.c → src/guest/sh4/sh4_dbg.c
View File

@ -1,5 +1,5 @@
#include "debugger.h" #include "guest/debugger.h"
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
#include "jit/frontend/sh4/sh4_disasm.h" #include "jit/frontend/sh4/sh4_disasm.h"
#include "jit/frontend/sh4/sh4_fallback.h" #include "jit/frontend/sh4/sh4_fallback.h"

2
src/hw/sh4/sh4_dmac.c → src/guest/sh4/sh4_dmac.c
View File

@ -1,4 +1,4 @@
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
static void sh4_dmac_check(struct sh4 *sh4, int channel) { static void sh4_dmac_check(struct sh4 *sh4, int channel) {
union chcr *chcr = NULL; union chcr *chcr = NULL;

0
src/hw/sh4/sh4_int.inc → src/guest/sh4/sh4_int.inc
View File

4
src/hw/sh4/sh4_intc.c → src/guest/sh4/sh4_intc.c
View File

@ -1,4 +1,4 @@
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
struct sh4_interrupt_info { struct sh4_interrupt_info {
int intevt, default_priority, ipr, ipr_shift; int intevt, default_priority, ipr, ipr_shift;
@ -7,7 +7,7 @@ struct sh4_interrupt_info {
static struct sh4_interrupt_info sh4_interrupts[NUM_SH_INTERRUPTS] = { static struct sh4_interrupt_info sh4_interrupts[NUM_SH_INTERRUPTS] = {
#define SH4_INT(name, intevt, pri, ipr, ipr_shift) \ #define SH4_INT(name, intevt, pri, ipr, ipr_shift) \
{intevt, pri, ipr, ipr_shift}, {intevt, pri, ipr, ipr_shift},
#include "hw/sh4/sh4_int.inc" #include "guest/sh4/sh4_int.inc"
#undef SH4_INT #undef SH4_INT
}; };

0
src/hw/sh4/sh4_regs.inc → src/guest/sh4/sh4_regs.inc
View File

4
src/hw/sh4/sh4_tmu.c → src/guest/sh4/sh4_tmu.c
View File

@ -1,5 +1,5 @@
#include "hw/sh4/sh4.h" #include "guest/scheduler.h"
#include "scheduler.h" #include "guest/sh4/sh4.h"
static const int64_t PERIPHERAL_CLOCK_FREQ = SH4_CLOCK_FREQ >> 2; static const int64_t PERIPHERAL_CLOCK_FREQ = SH4_CLOCK_FREQ >> 2;
static const int PERIPHERAL_SCALE[] = {2, 4, 6, 8, 10, 0, 0, 0}; static const int PERIPHERAL_SCALE[] = {2, 4, 6, 8, 10, 0, 0, 0};

4
src/hw/sh4/sh4_types.h → src/guest/sh4/sh4_types.h
View File

@ -72,14 +72,14 @@ union dmaor {
enum { enum {
#define SH4_REG(addr, name, default, type) name = SH4_REG_OFFSET(addr), #define SH4_REG(addr, name, default, type) name = SH4_REG_OFFSET(addr),
#include "hw/sh4/sh4_regs.inc" #include "guest/sh4/sh4_regs.inc"
#undef SH4_REG #undef SH4_REG
NUM_SH4_REGS = SH4_REG_OFFSET(0xffffffff) + 1 NUM_SH4_REGS = SH4_REG_OFFSET(0xffffffff) + 1
}; };
enum sh4_interrupt { enum sh4_interrupt {
#define SH4_INT(name, intevt, pri, ipr, ipr_shift) SH4_INT_##name, #define SH4_INT(name, intevt, pri, ipr, ipr_shift) SH4_INT_##name,
#include "hw/sh4/sh4_int.inc" #include "guest/sh4/sh4_int.inc"
#undef SH4_INT #undef SH4_INT
NUM_SH_INTERRUPTS NUM_SH_INTERRUPTS
}; };

6
src/tracer.c
View File

@ -1,9 +1,9 @@
#include "tracer.h" #include "tracer.h"
#include "core/math.h" #include "core/math.h"
#include "guest/pvr/ta.h"
#include "guest/pvr/tr.h"
#include "guest/pvr/trace.h"
#include "host/host.h" #include "host/host.h"
#include "hw/pvr/ta.h"
#include "hw/pvr/tr.h"
#include "hw/pvr/trace.h"
#include "render/imgui.h" #include "render/imgui.h"
#define SCRUBBER_WINDOW_HEIGHT 20.0f #define SCRUBBER_WINDOW_HEIGHT 20.0f

4
test/test_sh4.c
View File

@ -1,6 +1,6 @@
#include "core/math.h" #include "core/math.h"
#include "dreamcast.h" #include "guest/dreamcast.h"
#include "hw/sh4/sh4.h" #include "guest/sh4/sh4.h"
#include "retest.h" #include "retest.h"
static const uint32_t UNINITIALIZED_REG = 0xbaadf00d; static const uint32_t UNINITIALIZED_REG = 0xbaadf00d;

4
tools/retrace/depth.c
View File

@ -2,8 +2,8 @@
#include <stdlib.h> #include <stdlib.h>
#include "core/assert.h" #include "core/assert.h"
#include "core/sort.h" #include "core/sort.h"
#include "hw/pvr/tr.h" #include "guest/pvr/tr.h"
#include "hw/pvr/trace.h" #include "guest/pvr/trace.h"
struct depth_entry { struct depth_entry {
/* vertex index */ /* vertex index */