RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes and improvements for type issues, part 3

Browse source
This commit is contained in:
kub 2021-02-05 23:01:25 +01:00
parent 832faed320
commit 4cc0fcaf15
15 changed files with 149 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

62
cpu/fame/fame.h
View file

@ -98,14 +98,62 @@ extern "C" {
/* Data definition */
/*******************/
#include <pico/pico_types.h>
/*
#ifdef u8
#undef u8
#endif
#ifdef s8
#undef s8
#endif
#ifdef u16
#undef u16
#endif
#ifdef s16
#undef s16
#endif
#ifdef u32
#undef u32
#endif
#ifdef s32
#undef s32
#endif
#ifdef uptr
#undef uptr
#endif
#define u8 unsigned char
#define s8 signed char
#define u16 unsigned short
#define s16 signed short
#define u32 unsigned int
#define s32 signed int
#define uptr uintptr_t
*/
/*
typedef unsigned char u8;
typedef signed char s8;
typedef unsigned short u16;
typedef signed short s16;
typedef unsigned int u32;
typedef signed int s32;
*/
typedef union
{
unsigned char B;
signed char SB;
unsigned short W;
signed short SW;
unsigned int D;
signed int SD;
u8 B;
s8 SB;
u16 W;
s16 SW;
u32 D;
s32 SD;
} famec_union32;
/* M68K CPU CONTEXT */
@ -167,7 +215,7 @@ int fm68k_reset(M68K_CONTEXT *ctx);
int fm68k_emulate(M68K_CONTEXT *ctx, int n, fm68k_call_reason reason);
int fm68k_would_interrupt(M68K_CONTEXT *ctx); // to be called from fm68k_emulate()
unsigned int fm68k_get_pc(const M68K_CONTEXT *ctx);
u32 fm68k_get_pc(const M68K_CONTEXT *ctx);
// PICODRIVE_HACK
int fm68k_idle_install(void);

50
cpu/fame/famec.c
View file

@ -60,54 +60,6 @@
#define FAMEC_EXTRA_INLINE INLINE
#endif
#include <pico/pico_types.h>
/*
#ifdef u8
#undef u8
#endif
#ifdef s8
#undef s8
#endif
#ifdef u16
#undef u16
#endif
#ifdef s16
#undef s16
#endif
#ifdef u32
#undef u32
#endif
#ifdef s32
#undef s32
#endif
#ifdef uptr
#undef uptr
#endif
#define u8 unsigned char
#define s8 signed char
#define u16 unsigned short
#define s16 signed short
#define u32 unsigned int
#define s32 signed int
#define uptr uintptr_t
*/
/*
typedef unsigned char u8;
typedef signed char s8;
typedef unsigned short u16;
typedef signed short s16;
typedef unsigned int u32;
typedef signed int s32;
*/
#ifndef M68K_OK
#define M68K_OK 0
#endif
@ -807,7 +759,7 @@ static FAMEC_EXTRA_INLINE u32 execute_exception_group_0(M68K_CONTEXT *ctx, s32 v
// main exec function
//////////////////////
int fm68k_emulate(M68K_CONTEXT *ctx, s32 cycles, fm68k_call_reason reason)
int fm68k_emulate(M68K_CONTEXT *ctx, int cycles, fm68k_call_reason reason)
{
#ifndef FAMEC_NO_GOTOS
u32 Opcode;