mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 04:20:40 +02:00
ARM: Reorganized file structure to move shared SkyEye code to a more common area.
Removed s_ prefix
This commit is contained in:
parent
fd7f92d242
commit
b5e6524594
@ -9,7 +9,7 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "common/break_points.h"
|
#include "common/break_points.h"
|
||||||
#include "common/symbols.h"
|
#include "common/symbols.h"
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/disassembler/arm_disasm.h"
|
#include "core/arm/disassembler/arm_disasm.h"
|
||||||
|
|
||||||
DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
|
DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
|
||||||
|
@ -9,10 +9,6 @@ set(SRCS
|
|||||||
arm/interpreter/mmu/tlb.cpp
|
arm/interpreter/mmu/tlb.cpp
|
||||||
arm/interpreter/mmu/wb.cpp
|
arm/interpreter/mmu/wb.cpp
|
||||||
arm/interpreter/mmu/xscale_copro.cpp
|
arm/interpreter/mmu/xscale_copro.cpp
|
||||||
arm/interpreter/vfp/vfp.cpp
|
|
||||||
arm/interpreter/vfp/vfpdouble.cpp
|
|
||||||
arm/interpreter/vfp/vfpinstr.cpp
|
|
||||||
arm/interpreter/vfp/vfpsingle.cpp
|
|
||||||
arm/interpreter/arm_interpreter.cpp
|
arm/interpreter/arm_interpreter.cpp
|
||||||
arm/interpreter/armcopro.cpp
|
arm/interpreter/armcopro.cpp
|
||||||
arm/interpreter/armemu.cpp
|
arm/interpreter/armemu.cpp
|
||||||
@ -22,6 +18,10 @@ set(SRCS
|
|||||||
arm/interpreter/armsupp.cpp
|
arm/interpreter/armsupp.cpp
|
||||||
arm/interpreter/armvirt.cpp
|
arm/interpreter/armvirt.cpp
|
||||||
arm/interpreter/thumbemu.cpp
|
arm/interpreter/thumbemu.cpp
|
||||||
|
arm/skyeye_common/vfp/vfp.cpp
|
||||||
|
arm/skyeye_common/vfp/vfpdouble.cpp
|
||||||
|
arm/skyeye_common/vfp/vfpinstr.cpp
|
||||||
|
arm/skyeye_common/vfp/vfpsingle.cpp
|
||||||
file_sys/archive_romfs.cpp
|
file_sys/archive_romfs.cpp
|
||||||
file_sys/archive_sdmc.cpp
|
file_sys/archive_sdmc.cpp
|
||||||
file_sys/file_romfs.cpp
|
file_sys/file_romfs.cpp
|
||||||
@ -63,23 +63,23 @@ set(SRCS
|
|||||||
set(HEADERS
|
set(HEADERS
|
||||||
arm/disassembler/arm_disasm.h
|
arm/disassembler/arm_disasm.h
|
||||||
arm/disassembler/load_symbol_map.h
|
arm/disassembler/load_symbol_map.h
|
||||||
|
arm/interpreter/arm_interpreter.h
|
||||||
arm/interpreter/mmu/arm1176jzf_s_mmu.h
|
arm/interpreter/mmu/arm1176jzf_s_mmu.h
|
||||||
arm/interpreter/mmu/cache.h
|
arm/interpreter/mmu/cache.h
|
||||||
arm/interpreter/mmu/rb.h
|
arm/interpreter/mmu/rb.h
|
||||||
arm/interpreter/mmu/sa_mmu.h
|
arm/interpreter/mmu/sa_mmu.h
|
||||||
arm/interpreter/mmu/tlb.h
|
arm/interpreter/mmu/tlb.h
|
||||||
arm/interpreter/mmu/wb.h
|
arm/interpreter/mmu/wb.h
|
||||||
arm/interpreter/vfp/asm_vfp.h
|
arm/skyeye_common/vfp/asm_vfp.h
|
||||||
arm/interpreter/vfp/vfp.h
|
arm/skyeye_common/vfp/vfp.h
|
||||||
arm/interpreter/vfp/vfp_helper.h
|
arm/skyeye_common/vfp/vfp_helper.h
|
||||||
arm/interpreter/arm_interpreter.h
|
arm/skyeye_common/arm_regformat.h
|
||||||
arm/interpreter/arm_regformat.h
|
arm/skyeye_common/armcpu.h
|
||||||
arm/interpreter/armcpu.h
|
arm/skyeye_common/armdefs.h
|
||||||
arm/interpreter/armdefs.h
|
arm/skyeye_common/armemu.h
|
||||||
arm/interpreter/armemu.h
|
arm/skyeye_common/armmmu.h
|
||||||
arm/interpreter/armmmu.h
|
arm/skyeye_common/armos.h
|
||||||
arm/interpreter/armos.h
|
arm/skyeye_common/skyeye_defs.h
|
||||||
arm/interpreter/skyeye_defs.h
|
|
||||||
arm/arm_interface.h
|
arm/arm_interface.h
|
||||||
file_sys/archive.h
|
file_sys/archive.h
|
||||||
file_sys/archive_romfs.h
|
file_sys/archive_romfs.h
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include "core/arm/interpreter/arm_interpreter.h"
|
#include "core/arm/interpreter/arm_interpreter.h"
|
||||||
|
|
||||||
const static cpu_config_t s_arm11_cpu_info = {
|
const static cpu_config_t arm11_cpu_info = {
|
||||||
"armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE
|
"armv6", "arm11", 0x0007b000, 0x0007f000, NONCACHE
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ ARM_Interpreter::ARM_Interpreter() {
|
|||||||
ARMul_NewState(state);
|
ARMul_NewState(state);
|
||||||
|
|
||||||
state->abort_model = 0;
|
state->abort_model = 0;
|
||||||
state->cpu = (cpu_config_t*)&s_arm11_cpu_info;
|
state->cpu = (cpu_config_t*)&arm11_cpu_info;
|
||||||
state->bigendSig = LOW;
|
state->bigendSig = LOW;
|
||||||
|
|
||||||
ARMul_SelectProcessor(state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop);
|
ARMul_SelectProcessor(state, ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop);
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
|
|
||||||
#include "core/arm/arm_interface.h"
|
#include "core/arm/arm_interface.h"
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
|
|
||||||
class ARM_Interpreter : virtual public ARM_Interface {
|
class ARM_Interpreter : virtual public ARM_Interface {
|
||||||
public:
|
public:
|
||||||
|
@ -16,10 +16,10 @@
|
|||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
||||||
|
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/armos.h"
|
#include "core/arm/skyeye_common/armos.h"
|
||||||
#include "core/arm/interpreter/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
#include "core/arm/interpreter/vfp/vfp.h"
|
#include "core/arm/skyeye_common/vfp/vfp.h"
|
||||||
|
|
||||||
//chy 2005-07-08
|
//chy 2005-07-08
|
||||||
//#include "ansidecl.h"
|
//#include "ansidecl.h"
|
||||||
|
@ -18,9 +18,9 @@
|
|||||||
|
|
||||||
//#include <util.h> // DEBUG()
|
//#include <util.h> // DEBUG()
|
||||||
|
|
||||||
#include "arm_regformat.h"
|
#include "core/arm/skyeye_common/arm_regformat.h"
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
#include "core/hle/hle.h"
|
#include "core/hle/hle.h"
|
||||||
|
|
||||||
//#include "svc.h"
|
//#include "svc.h"
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
//#include <unistd.h>
|
//#include <unistd.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
|
|
||||||
/***************************************************************************\
|
/***************************************************************************\
|
||||||
* Definitions for the emulator architecture *
|
* Definitions for the emulator architecture *
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
/* two header for arm disassemble */
|
/* two header for arm disassemble */
|
||||||
//#include "skyeye_arch.h"
|
//#include "skyeye_arch.h"
|
||||||
#include "armcpu.h"
|
#include "core/arm/skyeye_common/armcpu.h"
|
||||||
|
|
||||||
|
|
||||||
extern mmu_ops_t xscale_mmu_ops;
|
extern mmu_ops_t xscale_mmu_ops;
|
||||||
|
@ -28,7 +28,7 @@ fun, and definign VAILDATE will define SWI 1 to enter SVC mode, and SWI
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "skyeye_defs.h"
|
#include "core/arm/skyeye_common/skyeye_defs.h"
|
||||||
#ifndef __USE_LARGEFILE64
|
#ifndef __USE_LARGEFILE64
|
||||||
#define __USE_LARGEFILE64 /* When use 64 bit large file need define it! for stat64*/
|
#define __USE_LARGEFILE64 /* When use 64 bit large file need define it! for stat64*/
|
||||||
#endif
|
#endif
|
||||||
@ -74,9 +74,9 @@ extern int _fisatty (FILE *);
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "armos.h"
|
#include "core/arm/skyeye_common/armos.h"
|
||||||
#include "armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
|
|
||||||
#ifndef NOOS
|
#ifndef NOOS
|
||||||
#ifndef VALIDATE
|
#ifndef VALIDATE
|
||||||
|
@ -23,8 +23,8 @@ table. The routines PutWord and GetWord implement this. Pages are never
|
|||||||
freed as they might be needed again. A single area of memory may be
|
freed as they might be needed again. A single area of memory may be
|
||||||
defined to generate aborts. */
|
defined to generate aborts. */
|
||||||
|
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "skyeye_defs.h"
|
#include "core/arm/skyeye_common/skyeye_defs.h"
|
||||||
//#include "code_cov.h"
|
//#include "code_cov.h"
|
||||||
|
|
||||||
#ifdef VALIDATE /* for running the validate suite */
|
#ifdef VALIDATE /* for running the validate suite */
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
|
|
||||||
#include "core/mem_map.h"
|
#include "core/mem_map.h"
|
||||||
|
|
||||||
#include "core/arm/interpreter/skyeye_defs.h"
|
#include "core/arm/skyeye_common/skyeye_defs.h"
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
//#include "bank_defs.h"
|
//#include "bank_defs.h"
|
||||||
#if 0
|
#if 0
|
||||||
#define TLB_SIZE 1024 * 1024
|
#define TLB_SIZE 1024 * 1024
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
/* mmu cache init
|
/* mmu cache init
|
||||||
*
|
*
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
|
|
||||||
|
|
||||||
/*#define CIRRUS_DEBUG 1 */
|
/*#define CIRRUS_DEBUG 1 */
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
/*chy 2004-06-06, fix bug found by wenye@cs.ucsb.edu*/
|
/*chy 2004-06-06, fix bug found by wenye@cs.ucsb.edu*/
|
||||||
ARMword rb_masks[] = {
|
ARMword rb_masks[] = {
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The interface of read data from bus
|
* The interface of read data from bus
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
ARMword tlb_masks[] = {
|
ARMword tlb_masks[] = {
|
||||||
0x00000000, /* TLB_INVALID */
|
0x00000000, /* TLB_INVALID */
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
/* wb_init
|
/* wb_init
|
||||||
* @wb_t :wb_t to init
|
* @wb_t :wb_t to init
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
|
|
||||||
/*#include "pxa.h" */
|
/*#include "pxa.h" */
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
instruction into its corresponding ARM instruction, and using the
|
instruction into its corresponding ARM instruction, and using the
|
||||||
existing ARM simulator. */
|
existing ARM simulator. */
|
||||||
|
|
||||||
#include "skyeye_defs.h"
|
#include "core/arm/skyeye_common/skyeye_defs.h"
|
||||||
|
|
||||||
#ifndef MODET /* required for the Thumb instruction support */
|
#ifndef MODET /* required for the Thumb instruction support */
|
||||||
#if 1
|
#if 1
|
||||||
@ -29,9 +29,9 @@ existing ARM simulator. */
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
#include "armos.h"
|
#include "core/arm/skyeye_common/armos.h"
|
||||||
|
|
||||||
|
|
||||||
/* Decode a 16bit Thumb instruction. The instruction is in the low
|
/* Decode a 16bit Thumb instruction. The instruction is in the low
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
#include "arm_regformat.h"
|
#include "arm_regformat.h"
|
||||||
#include "common/platform.h"
|
#include "common/platform.h"
|
||||||
#include "skyeye_defs.h"
|
#include "core/arm/skyeye_common/skyeye_defs.h"
|
||||||
|
|
||||||
//AJ2D--------------------------------------------------------------------------
|
//AJ2D--------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -130,7 +130,7 @@ typedef unsigned long long uint64_t;
|
|||||||
#endif
|
#endif
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "armmmu.h"
|
#include "core/arm/skyeye_common/armmmu.h"
|
||||||
//#include "lcd/skyeye_lcd.h"
|
//#include "lcd/skyeye_lcd.h"
|
||||||
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
|||||||
#define __ARMEMU_H__
|
#define __ARMEMU_H__
|
||||||
|
|
||||||
|
|
||||||
#include "armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
//#include "skyeye.h"
|
//#include "skyeye.h"
|
||||||
|
|
||||||
//extern ARMword isize;
|
//extern ARMword isize;
|
@ -25,8 +25,8 @@
|
|||||||
|
|
||||||
#include "common/common.h"
|
#include "common/common.h"
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/interpreter/vfp/vfp.h"
|
#include "core/arm/skyeye_common/vfp/vfp.h"
|
||||||
|
|
||||||
//ARMul_State* persistent_state; /* function calls from SoftFloat lib don't have an access to ARMul_state. */
|
//ARMul_State* persistent_state; /* function calls from SoftFloat lib don't have an access to ARMul_state. */
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ VFPMRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value)
|
|||||||
if (CoProc == 10 || CoProc == 11)
|
if (CoProc == 10 || CoProc == 11)
|
||||||
{
|
{
|
||||||
#define VFP_MRC_TRANS
|
#define VFP_MRC_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MRC_TRANS
|
#undef VFP_MRC_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n",
|
||||||
@ -88,7 +88,7 @@ VFPMCR (ARMul_State * state, unsigned type, ARMword instr, ARMword value)
|
|||||||
if (CoProc == 10 || CoProc == 11)
|
if (CoProc == 10 || CoProc == 11)
|
||||||
{
|
{
|
||||||
#define VFP_MCR_TRANS
|
#define VFP_MCR_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MCR_TRANS
|
#undef VFP_MCR_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, CRn %x, CRm %x, OPC_2 %x\n",
|
||||||
@ -110,7 +110,7 @@ VFPMRRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value1, AR
|
|||||||
if (CoProc == 10 || CoProc == 11)
|
if (CoProc == 10 || CoProc == 11)
|
||||||
{
|
{
|
||||||
#define VFP_MRRC_TRANS
|
#define VFP_MRRC_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MRRC_TRANS
|
#undef VFP_MRRC_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n",
|
||||||
@ -136,7 +136,7 @@ VFPMCRR (ARMul_State * state, unsigned type, ARMword instr, ARMword value1, ARMw
|
|||||||
if (CoProc == 11 || CoProc == 10)
|
if (CoProc == 11 || CoProc == 10)
|
||||||
{
|
{
|
||||||
#define VFP_MCRR_TRANS
|
#define VFP_MCRR_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MCRR_TRANS
|
#undef VFP_MCRR_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, OPC_1 %x, Rt %x, Rt2 %x, CRm %x\n",
|
||||||
@ -179,7 +179,7 @@ VFPSTC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define VFP_STC_TRANS
|
#define VFP_STC_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_STC_TRANS
|
#undef VFP_STC_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n",
|
||||||
@ -210,7 +210,7 @@ VFPLDC (ARMul_State * state, unsigned type, ARMword instr, ARMword value)
|
|||||||
if (CoProc == 10 || CoProc == 11)
|
if (CoProc == 10 || CoProc == 11)
|
||||||
{
|
{
|
||||||
#define VFP_LDC_TRANS
|
#define VFP_LDC_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_LDC_TRANS
|
#undef VFP_LDC_TRANS
|
||||||
}
|
}
|
||||||
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n",
|
DEBUG_LOG(ARM11, "Can't identify %x, CoProc %x, CRd %x, Rn %x, imm8 %x, P %x, U %x, D %x, W %x\n",
|
||||||
@ -237,7 +237,7 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr)
|
|||||||
if (CoProc == 10 || CoProc == 11)
|
if (CoProc == 10 || CoProc == 11)
|
||||||
{
|
{
|
||||||
#define VFP_CDP_TRANS
|
#define VFP_CDP_TRANS
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_CDP_TRANS
|
#undef VFP_CDP_TRANS
|
||||||
|
|
||||||
int exceptions = 0;
|
int exceptions = 0;
|
||||||
@ -257,21 +257,21 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr)
|
|||||||
|
|
||||||
/* ----------- MRC ------------ */
|
/* ----------- MRC ------------ */
|
||||||
#define VFP_MRC_IMPL
|
#define VFP_MRC_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MRC_IMPL
|
#undef VFP_MRC_IMPL
|
||||||
|
|
||||||
#define VFP_MRRC_IMPL
|
#define VFP_MRRC_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MRRC_IMPL
|
#undef VFP_MRRC_IMPL
|
||||||
|
|
||||||
|
|
||||||
/* ----------- MCR ------------ */
|
/* ----------- MCR ------------ */
|
||||||
#define VFP_MCR_IMPL
|
#define VFP_MCR_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MCR_IMPL
|
#undef VFP_MCR_IMPL
|
||||||
|
|
||||||
#define VFP_MCRR_IMPL
|
#define VFP_MCRR_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_MCRR_IMPL
|
#undef VFP_MCRR_IMPL
|
||||||
|
|
||||||
/* Memory operation are not inlined, as old Interpreter and Fast interpreter
|
/* Memory operation are not inlined, as old Interpreter and Fast interpreter
|
||||||
@ -283,19 +283,19 @@ VFPCDP (ARMul_State * state, unsigned type, ARMword instr)
|
|||||||
|
|
||||||
/* ----------- STC ------------ */
|
/* ----------- STC ------------ */
|
||||||
#define VFP_STC_IMPL
|
#define VFP_STC_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_STC_IMPL
|
#undef VFP_STC_IMPL
|
||||||
|
|
||||||
|
|
||||||
/* ----------- LDC ------------ */
|
/* ----------- LDC ------------ */
|
||||||
#define VFP_LDC_IMPL
|
#define VFP_LDC_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_LDC_IMPL
|
#undef VFP_LDC_IMPL
|
||||||
|
|
||||||
|
|
||||||
/* ----------- CDP ------------ */
|
/* ----------- CDP ------------ */
|
||||||
#define VFP_CDP_IMPL
|
#define VFP_CDP_IMPL
|
||||||
#include "core/arm/interpreter/vfp/vfpinstr.cpp"
|
#include "core/arm/skyeye_common/vfp/vfpinstr.cpp"
|
||||||
#undef VFP_CDP_IMPL
|
#undef VFP_CDP_IMPL
|
||||||
|
|
||||||
/* Miscellaneous functions */
|
/* Miscellaneous functions */
|
@ -25,7 +25,7 @@
|
|||||||
|
|
||||||
#define vfpdebug //printf
|
#define vfpdebug //printf
|
||||||
|
|
||||||
#include "core/arm/interpreter/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */
|
#include "core/arm/skyeye_common/vfp/vfp_helper.h" /* for references to cdp SoftFloat functions */
|
||||||
|
|
||||||
unsigned VFPInit (ARMul_State *state);
|
unsigned VFPInit (ARMul_State *state);
|
||||||
unsigned VFPMRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value);
|
unsigned VFPMRC (ARMul_State * state, unsigned type, ARMword instr, ARMword * value);
|
@ -38,7 +38,7 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
#define u16 uint16_t
|
#define u16 uint16_t
|
||||||
#define u32 uint32_t
|
#define u32 uint32_t
|
@ -51,9 +51,9 @@
|
|||||||
* ===========================================================================
|
* ===========================================================================
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "core/arm/interpreter/vfp/vfp.h"
|
#include "core/arm/skyeye_common/vfp/vfp.h"
|
||||||
#include "core/arm/interpreter/vfp/vfp_helper.h"
|
#include "core/arm/skyeye_common/vfp/vfp_helper.h"
|
||||||
#include "core/arm/interpreter/vfp/asm_vfp.h"
|
#include "core/arm/skyeye_common/vfp/asm_vfp.h"
|
||||||
|
|
||||||
static struct vfp_double vfp_double_default_qnan = {
|
static struct vfp_double vfp_double_default_qnan = {
|
||||||
//.exponent = 2047,
|
//.exponent = 2047,
|
@ -51,9 +51,9 @@
|
|||||||
* ===========================================================================
|
* ===========================================================================
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "core/arm/interpreter/vfp/vfp_helper.h"
|
#include "core/arm/skyeye_common/vfp/vfp_helper.h"
|
||||||
#include "core/arm/interpreter/vfp/asm_vfp.h"
|
#include "core/arm/skyeye_common/vfp/asm_vfp.h"
|
||||||
#include "core/arm/interpreter/vfp/vfp.h"
|
#include "core/arm/skyeye_common/vfp/vfp.h"
|
||||||
|
|
||||||
static struct vfp_single vfp_single_default_qnan = {
|
static struct vfp_single vfp_single_default_qnan = {
|
||||||
//.exponent = 255,
|
//.exponent = 255,
|
@ -5,7 +5,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "core/arm/arm_interface.h"
|
#include "core/arm/arm_interface.h"
|
||||||
#include "core/arm/interpreter/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user