mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-26 14:17:20 +02:00
arm: Get rid of armcpu.h and skyeye_types.h
This commit is contained in:
parent
904194c3e8
commit
83bc1a3120
@ -110,13 +110,11 @@ set(HEADERS
|
|||||||
arm/dyncom/arm_dyncom_thumb.h
|
arm/dyncom/arm_dyncom_thumb.h
|
||||||
arm/interpreter/arm_interpreter.h
|
arm/interpreter/arm_interpreter.h
|
||||||
arm/skyeye_common/arm_regformat.h
|
arm/skyeye_common/arm_regformat.h
|
||||||
arm/skyeye_common/armcpu.h
|
|
||||||
arm/skyeye_common/armdefs.h
|
arm/skyeye_common/armdefs.h
|
||||||
arm/skyeye_common/armemu.h
|
arm/skyeye_common/armemu.h
|
||||||
arm/skyeye_common/armmmu.h
|
arm/skyeye_common/armmmu.h
|
||||||
arm/skyeye_common/armos.h
|
arm/skyeye_common/armos.h
|
||||||
arm/skyeye_common/skyeye_defs.h
|
arm/skyeye_common/skyeye_defs.h
|
||||||
arm/skyeye_common/skyeye_types.h
|
|
||||||
arm/skyeye_common/vfp/asm_vfp.h
|
arm/skyeye_common/vfp/asm_vfp.h
|
||||||
arm/skyeye_common/vfp/vfp.h
|
arm/skyeye_common/vfp/vfp.h
|
||||||
arm/skyeye_common/vfp/vfp_helper.h
|
arm/skyeye_common/vfp/vfp_helper.h
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include "core/arm/skyeye_common/armcpu.h"
|
|
||||||
#include "core/arm/skyeye_common/armemu.h"
|
#include "core/arm/skyeye_common/armemu.h"
|
||||||
#include "core/arm/skyeye_common/vfp/vfp.h"
|
#include "core/arm/skyeye_common/vfp/vfp.h"
|
||||||
|
|
||||||
|
@ -19,8 +19,6 @@
|
|||||||
#ifndef __ARM_DYNCOM_RUN__
|
#ifndef __ARM_DYNCOM_RUN__
|
||||||
#define __ARM_DYNCOM_RUN__
|
#define __ARM_DYNCOM_RUN__
|
||||||
|
|
||||||
#include "core/arm/skyeye_common/skyeye_types.h"
|
|
||||||
|
|
||||||
void switch_mode(arm_core_t *core, uint32_t mode);
|
void switch_mode(arm_core_t *core, uint32_t mode);
|
||||||
|
|
||||||
/* FIXME, we temporarily think thumb instruction is always 16 bit */
|
/* FIXME, we temporarily think thumb instruction is always 16 bit */
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#define __ARM_DYNCOM_THUMB_H__
|
#define __ARM_DYNCOM_THUMB_H__
|
||||||
|
|
||||||
#include "core/arm/skyeye_common/armdefs.h"
|
#include "core/arm/skyeye_common/armdefs.h"
|
||||||
#include "core/arm/skyeye_common/skyeye_types.h"
|
|
||||||
|
|
||||||
enum tdstate {
|
enum tdstate {
|
||||||
t_undefined, // Undefined Thumb instruction
|
t_undefined, // Undefined Thumb instruction
|
||||||
|
@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* arm
|
|
||||||
* armcpu.h
|
|
||||||
*
|
|
||||||
* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as
|
|
||||||
* published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __ARM_CPU_H__
|
|
||||||
#define __ARM_CPU_H__
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include "core/arm/skyeye_common/armdefs.h"
|
|
||||||
|
|
||||||
typedef struct ARM_CPU_State_s {
|
|
||||||
ARMul_State * core;
|
|
||||||
uint32_t core_num;
|
|
||||||
/* The core id that boot from
|
|
||||||
*/
|
|
||||||
uint32_t boot_core_id;
|
|
||||||
}ARM_CPU_State;
|
|
||||||
|
|
||||||
//static ARM_CPU_State* get_current_cpu(){
|
|
||||||
// machine_config_t* mach = get_current_mach();
|
|
||||||
// /* Casting a conf_obj_t to ARM_CPU_State type */
|
|
||||||
// ARM_CPU_State* cpu = (ARM_CPU_State*)mach->cpu_data->obj;
|
|
||||||
//
|
|
||||||
// return cpu;
|
|
||||||
//}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Get the core instance boot from
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
//static ARMul_State* get_boot_core(){
|
|
||||||
// ARM_CPU_State* cpu = get_current_cpu();
|
|
||||||
// return &cpu->core[cpu->boot_core_id];
|
|
||||||
//}
|
|
||||||
/**
|
|
||||||
* @brief Get the instance of running core
|
|
||||||
*
|
|
||||||
* @return the core instance
|
|
||||||
*/
|
|
||||||
//static ARMul_State* get_current_core(){
|
|
||||||
// /* Casting a conf_obj_t to ARM_CPU_State type */
|
|
||||||
// int id = Common::CurrentThreadId();
|
|
||||||
// /* If thread is not in running mode, we should give the boot core */
|
|
||||||
// if(get_thread_state(id) != Running_state){
|
|
||||||
// return get_boot_core();
|
|
||||||
// }
|
|
||||||
// /* Judge if we are running in paralell or sequenial */
|
|
||||||
// if(thread_exist(id)){
|
|
||||||
// conf_object_t* conf_obj = get_current_exec_priv(id);
|
|
||||||
// return (ARMul_State*)get_cast_conf_obj(conf_obj, "arm_core_t");
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return NULL;
|
|
||||||
//}
|
|
||||||
|
|
||||||
#define CURRENT_CORE get_current_core()
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
|||||||
/*
|
|
||||||
skyeye_types.h - some data types definition for skyeye debugger
|
|
||||||
Copyright (C) 2003 Skyeye Develop Group
|
|
||||||
for help please send mail to <skyeye-developer@lists.sf.linuxforum.net>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
* 12/16/2006 Michael.Kang <blackfin.kang@gmail.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
typedef uint32_t address_t;
|
|
||||||
typedef uint32_t physical_address_t;
|
|
||||||
typedef uint32_t generic_address_t;
|
|
Loading…
Reference in New Issue
Block a user