mirror of
				https://git.suyu.dev/suyu/suyu
				synced 2025-11-04 00:49:02 -06:00 
			
		
		
		
	fixed project includes to use new directory structure
This commit is contained in:
		@@ -4,8 +4,8 @@
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "common.h"
 | 
			
		||||
#include "common_types.h"
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
#include "common/common_types.h"
 | 
			
		||||
 | 
			
		||||
/// Generic ARM11 CPU interface
 | 
			
		||||
class ARM_Interface {
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,8 @@
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include "arm_disasm.h"
 | 
			
		||||
 | 
			
		||||
#include "core/arm/disassembler/arm_disasm.h"
 | 
			
		||||
 | 
			
		||||
static const char *cond_names[] = {
 | 
			
		||||
    "eq",
 | 
			
		||||
 
 | 
			
		||||
@@ -24,12 +24,11 @@
 | 
			
		||||
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include "common.h"
 | 
			
		||||
#include "common_types.h"
 | 
			
		||||
#include "arm/arm_interface.h"
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
 | 
			
		||||
#include "arm/interpreter/armdefs.h"
 | 
			
		||||
#include "arm/interpreter/armemu.h"
 | 
			
		||||
#include "core/arm/arm_interface.h"
 | 
			
		||||
#include "core/arm/interpreter/armdefs.h"
 | 
			
		||||
#include "core/arm/interpreter/armemu.h"
 | 
			
		||||
 | 
			
		||||
class ARM_Interpreter : virtual public ARM_Interface {
 | 
			
		||||
public:
 | 
			
		||||
 
 | 
			
		||||
@@ -28,7 +28,7 @@
 | 
			
		||||
#include <stddef.h>
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
 | 
			
		||||
#include "thread.h"
 | 
			
		||||
#include "common/thread.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
typedef struct ARM_CPU_State_s {
 | 
			
		||||
 
 | 
			
		||||
@@ -32,7 +32,7 @@
 | 
			
		||||
//#include "portable/mman.h"
 | 
			
		||||
 | 
			
		||||
#include "arm_regformat.h"
 | 
			
		||||
#include "platform.h"
 | 
			
		||||
#include "common/platform.h"
 | 
			
		||||
#include "skyeye_defs.h"
 | 
			
		||||
 | 
			
		||||
//AJ2D--------------------------------------------------------------------------
 | 
			
		||||
@@ -82,7 +82,7 @@
 | 
			
		||||
//teawater add DBCT_TEST_SPEED 2005.10.04---------------------------------------
 | 
			
		||||
#include <signal.h>
 | 
			
		||||
 | 
			
		||||
#include "platform.h"
 | 
			
		||||
#include "common/platform.h"
 | 
			
		||||
 | 
			
		||||
#if EMU_PLATFORM == PLATFORM_LINUX
 | 
			
		||||
#include <sys/time.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@
 | 
			
		||||
#ifndef __ARMEMU_H__
 | 
			
		||||
#define __ARMEMU_H__
 | 
			
		||||
 | 
			
		||||
#include "common.h"
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
#include "armdefs.h"
 | 
			
		||||
//#include "skyeye.h"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,7 @@
 | 
			
		||||
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#include "platform.h"
 | 
			
		||||
#include "common/platform.h"
 | 
			
		||||
#if EMU_PLATFORM == PLATFORM_LINUX
 | 
			
		||||
#include <unistd.h>
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
@@ -172,18 +172,18 @@ typedef struct mmu_ops_s
 | 
			
		||||
} mmu_ops_t;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#include "arm/mmu/tlb.h"
 | 
			
		||||
#include "arm/mmu/rb.h"
 | 
			
		||||
#include "arm/mmu/wb.h"
 | 
			
		||||
#include "arm/mmu/cache.h"
 | 
			
		||||
#include "core/arm/mmu/tlb.h"
 | 
			
		||||
#include "core/arm/mmu/rb.h"
 | 
			
		||||
#include "core/arm/mmu/wb.h"
 | 
			
		||||
#include "core/arm/mmu/cache.h"
 | 
			
		||||
 | 
			
		||||
/*special process mmu.h*/
 | 
			
		||||
//#include "arm/mmu/sa_mmu.h"
 | 
			
		||||
//#include "arm/mmu/arm7100_mmu.h"
 | 
			
		||||
//#include "arm/mmu/arm920t_mmu.h"
 | 
			
		||||
//#include "arm/mmu/arm926ejs_mmu.h"
 | 
			
		||||
#include "arm/mmu/arm1176jzf_s_mmu.h"
 | 
			
		||||
//#include "arm/mmu/cortex_a9_mmu.h"
 | 
			
		||||
//#include "core/arm/mmu/sa_mmu.h"
 | 
			
		||||
//#include "core/arm/mmu/arm7100_mmu.h"
 | 
			
		||||
//#include "core/arm/mmu/arm920t_mmu.h"
 | 
			
		||||
//#include "core/arm/mmu/arm926ejs_mmu.h"
 | 
			
		||||
#include "core/arm/mmu/arm1176jzf_s_mmu.h"
 | 
			
		||||
//#include "core/arm/mmu/cortex_a9_mmu.h"
 | 
			
		||||
 | 
			
		||||
typedef struct mmu_state_t
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#ifndef CORE_ARM_SKYEYE_DEFS_H_
 | 
			
		||||
#define CORE_ARM_SKYEYE_DEFS_H_
 | 
			
		||||
 | 
			
		||||
#include "common.h"
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
 | 
			
		||||
#define MODE32
 | 
			
		||||
#define MODET
 | 
			
		||||
 
 | 
			
		||||
@@ -22,11 +22,11 @@
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <stdint.h>
 | 
			
		||||
 | 
			
		||||
#include "mem_map.h"
 | 
			
		||||
#include "core/mem_map.h"
 | 
			
		||||
 | 
			
		||||
#include "arm/interpreter/skyeye_defs.h"
 | 
			
		||||
#include "core/arm/interpreter/skyeye_defs.h"
 | 
			
		||||
 | 
			
		||||
#include "arm/interpreter/armdefs.h"
 | 
			
		||||
#include "core/arm/interpreter/armdefs.h"
 | 
			
		||||
//#include "bank_defs.h"
 | 
			
		||||
#if 0
 | 
			
		||||
#define TLB_SIZE 1024 * 1024
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user