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

Make sure function prototype signatures match, and put typedefs into

Browse source 
separate header file
This commit is contained in:
twinaphex 2020-07-12 13:58:17 +02:00 • committed by kub
parent 35984c2198
commit 182b8d01f9
3 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cpu/sh2/sh2.h
View file

@ -1,6 +1,7 @@
#ifndef __SH2_H__ #ifndef __SH2_H__
#define __SH2_H__ #define __SH2_H__
#include "../../pico/pico_types.h"
#include "../../pico/pico_port.h" #include "../../pico/pico_port.h"
// registers - matches structure order // registers - matches structure order
@ -129,12 +130,12 @@ static __inline int sh2_execute(SH2 *sh2, int cycles)
// pico memhandlers // pico memhandlers
// XXX: move somewhere else // XXX: move somewhere else
unsigned int REGPARM(2) p32x_sh2_read8(unsigned int a, SH2 *sh2); unsigned int REGPARM(2) p32x_sh2_read8(u32 a, SH2 *sh2);
unsigned int REGPARM(2) p32x_sh2_read16(unsigned int a, SH2 *sh2); unsigned int REGPARM(2) p32x_sh2_read16(u32 a, SH2 *sh2);
unsigned int REGPARM(2) p32x_sh2_read32(unsigned int a, SH2 *sh2); unsigned int REGPARM(2) p32x_sh2_read32(u32 a, SH2 *sh2);
void REGPARM(3) p32x_sh2_write8 (unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) p32x_sh2_write8 (u32 a, u32 d, SH2 *sh2);
void REGPARM(3) p32x_sh2_write16(unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) p32x_sh2_write16(u32 a, u32 d, SH2 *sh2);
void REGPARM(3) p32x_sh2_write32(unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) p32x_sh2_write32(u32 a, u32 d, SH2 *sh2);
// debug // debug
#ifdef DRC_CMP #ifdef DRC_CMP

46
pico/pico_int.h
View file

@ -9,7 +9,6 @@
#ifndef PICO_INTERNAL_INCLUDED #ifndef PICO_INTERNAL_INCLUDED
#define PICO_INTERNAL_INCLUDED #define PICO_INTERNAL_INCLUDED
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "pico_port.h" #include "pico_port.h"
@ -32,16 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#include "pico_types.h"
#ifndef UTYPES_DEFINED
typedef uint8_t u8;
typedef int8_t s8;
typedef uint16_t u16;
typedef int16_t s16;
typedef uint32_t u32;
typedef int32_t s32;
#endif
typedef uintptr_t uptr; // unsigned pointer-sized int
// ----------------------- 68000 CPU ----------------------- // ----------------------- 68000 CPU -----------------------
#ifdef EMU_C68K #ifdef EMU_C68K
@ -965,22 +955,22 @@ void p32x_schedule_hint(SH2 *sh2, unsigned int m68k_cycles);
// 32x/memory.c // 32x/memory.c
extern struct Pico32xMem *Pico32xMem; extern struct Pico32xMem *Pico32xMem;
unsigned int PicoRead8_32x(unsigned int a); unsigned int PicoRead8_32x(u32 a);
unsigned int PicoRead16_32x(unsigned int a); unsigned int PicoRead16_32x(u32 a);
void PicoWrite8_32x(unsigned int a, unsigned int d); void PicoWrite8_32x(u32 a, u32 d);
void PicoWrite16_32x(unsigned int a, unsigned int d); void PicoWrite16_32x(u32 a, u32 d);
void PicoMemSetup32x(void); void PicoMemSetup32x(void);
void Pico32xSwapDRAM(int b); void Pico32xSwapDRAM(int b);
void Pico32xMemStateLoaded(void); void Pico32xMemStateLoaded(void);
void p32x_update_banks(void); void p32x_update_banks(void);
void p32x_m68k_poll_event(unsigned int flags); void p32x_m68k_poll_event(u32 flags);
unsigned int REGPARM(3) p32x_sh2_poll_memory8(unsigned int a, unsigned int d, SH2 *sh2); unsigned int REGPARM(3) p32x_sh2_poll_memory8(u32 a, u32 d, SH2 *sh2);
unsigned int REGPARM(3) p32x_sh2_poll_memory16(unsigned int a, unsigned int d, SH2 *sh2); unsigned int REGPARM(3) p32x_sh2_poll_memory16(u32 a, u32 d, SH2 *sh2);
unsigned int REGPARM(3) p32x_sh2_poll_memory32(unsigned int a, unsigned int d, SH2 *sh2); unsigned int REGPARM(3) p32x_sh2_poll_memory32(u32 a, u32 d, SH2 *sh2);
void *p32x_sh2_get_mem_ptr(unsigned int a, unsigned int *mask, SH2 *sh2); void *p32x_sh2_get_mem_ptr(unsigned int a, unsigned int *mask, SH2 *sh2);
void p32x_sh2_poll_detect(unsigned int a, SH2 *sh2, unsigned int flags, int maxcnt); void p32x_sh2_poll_detect(u32 a, SH2 *sh2, u32 flags, int maxcnt);
void p32x_sh2_poll_event(SH2 *sh2, unsigned int flags, unsigned int m68k_cycles); void p32x_sh2_poll_event(SH2 *sh2, u32 flags, u32 m68k_cycles);
int p32x_sh2_memcpy(unsigned int dst, unsigned int src, int count, int size, SH2 *sh2); int p32x_sh2_memcpy(u32 dst, u32 src, int count, int size, SH2 *sh2);
// 32x/draw.c // 32x/draw.c
void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode); void PicoDrawSetOutFormat32x(pdso_t which, int use_32x_line_mode);
@ -1016,12 +1006,12 @@ void p32x_dreq1_trigger(void);
void p32x_timers_recalc(void); void p32x_timers_recalc(void);
void p32x_timer_do(SH2 *sh2, unsigned int m68k_slice); void p32x_timer_do(SH2 *sh2, unsigned int m68k_slice);
void sh2_peripheral_reset(SH2 *sh2); void sh2_peripheral_reset(SH2 *sh2);
unsigned int REGPARM(2) sh2_peripheral_read8(unsigned int a, SH2 *sh2); u32 REGPARM(2) sh2_peripheral_read8(u32 a, SH2 *sh2);
unsigned int REGPARM(2) sh2_peripheral_read16(unsigned int a, SH2 *sh2); u32 REGPARM(2) sh2_peripheral_read16(u32 a, SH2 *sh2);
unsigned int REGPARM(2) sh2_peripheral_read32(unsigned int a, SH2 *sh2); u32 REGPARM(2) sh2_peripheral_read32(u32 a, SH2 *sh2);
void REGPARM(3) sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) sh2_peripheral_write8(u32 a, u32 d, SH2 *sh2);
void REGPARM(3) sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) sh2_peripheral_write16(u32 a, u32 d, SH2 *sh2);
void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2); void REGPARM(3) sh2_peripheral_write32(u32 a, u32 d, SH2 *sh2);
#else #else
#define Pico32xInit() #define Pico32xInit()

16
pico/pico_types.h Normal file
View file

@ -0,0 +1,16 @@
#ifndef PICO_TYPES
#define PICO_TYPES
#include <stdint.h>
#ifndef UTYPES_DEFINED
typedef uint8_t u8;
typedef int8_t s8;
typedef uint16_t u16;
typedef int16_t s16;
typedef uint32_t u32;
typedef int32_t s32;
#endif
typedef uintptr_t uptr; /* unsigned pointer-sized int */
#endif