Skip to content

Commit cbbfa87

Browse files
jamsilvajamsilva
committed
Many cleanups.
1 parent 7ed90ab commit cbbfa87

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+661
-1462
lines changed

‎Makefile.common‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ SOURCES_C := \
1919
$(CORE_DIR)/data.c\
2020
$(CORE_DIR)/dma.c \
2121
$(CORE_DIR)/dsp1.c \
22-
$(CORE_DIR)/fxdbg.c \
2322
$(CORE_DIR)/fxemu.c \
2423
$(CORE_DIR)/fxinst.c \
2524
$(CORE_DIR)/gfx.c \

‎libretro.c‎

Lines changed: 6 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ void* linearMemAlign(size_t size, size_t alignment);
2626
void linearFree(void* mem);
2727
#endif
2828

29-
3029
static retro_log_printf_t log_cb = NULL;
3130
static retro_video_refresh_t video_cb = NULL;
3231
static retro_input_poll_t poll_cb = NULL;
@@ -46,7 +45,6 @@ char slash = '/';
4645

4746
static float samples_per_frame = 0.0;
4847

49-
5048
#ifdef PERF_TEST
5149
#define RETRO_PERFORMANCE_INIT(name) \
5250
retro_perf_tick_t current_ticks;\
@@ -76,7 +74,6 @@ void retro_set_environment(retro_environment_t cb)
7674
log_cb = NULL;
7775

7876
environ_cb(RETRO_ENVIRONMENT_GET_PERF_INTERFACE, &perf_cb);
79-
8077
}
8178

8279

@@ -86,7 +83,8 @@ void retro_set_video_refresh(retro_video_refresh_t cb)
8683
}
8784

8885
void retro_set_audio_sample(retro_audio_sample_t cb)
89-
{}
86+
{
87+
}
9088

9189
void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb)
9290
{
@@ -112,7 +110,6 @@ unsigned retro_api_version()
112110

113111
void S9xMessage(int type, int number, const char* message)
114112
{
115-
#if 1
116113
#define MAX_MESSAGE_LEN (36 * 3)
117114

118115
static char buffer [MAX_MESSAGE_LEN + 1];
@@ -121,7 +118,6 @@ void S9xMessage(int type, int number, const char* message)
121118
strncpy(buffer, message, MAX_MESSAGE_LEN);
122119
buffer [MAX_MESSAGE_LEN] = 0;
123120
S9xSetInfoString(buffer);
124-
#endif
125121
}
126122

127123
void S9xDeinitDisplay(void)
@@ -145,7 +141,6 @@ void S9xDeinitDisplay(void)
145141
GFX.ZBuffer_buffer = NULL;
146142
GFX.SubZBuffer = NULL;
147143
GFX.SubZBuffer_buffer = NULL;
148-
149144
}
150145

151146
void S9xInitDisplay(void)
@@ -172,16 +167,11 @@ void S9xInitDisplay(void)
172167
GFX.ZBuffer = GFX.ZBuffer_buffer + safety;
173168
GFX.SubZBuffer = GFX.SubZBuffer_buffer + safety;
174169

175-
176170
GFX.Delta = (GFX.SubScreen - GFX.Screen) >> 1;
177171
}
178172

179173
bool S9xInitUpdate()
180174
{
181-
// IPPU.RenderThisFrame = 0;
182-
// video_cb(dummy_frame,256,224,512);
183-
// return (false);
184-
185175
return (true);
186176
}
187177
#ifndef __WIN32__
@@ -303,7 +293,6 @@ void init_sfc_setting(void)
303293
Settings.StretchScreenshots = 1;
304294

305295
Settings.HBlankStart = (256 * Settings.H_Max) / SNES_HCOUNTER_MAX;
306-
307296
}
308297

309298
#ifdef USE_BLARGG_APU
@@ -359,12 +348,10 @@ void retro_init(void)
359348
S9xInitSound();
360349
#endif
361350
environ_cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars);
362-
363351
}
364352

365353
void retro_deinit(void)
366354
{
367-
368355
if (Settings.SPC7110)
369356
(*CleanUp7110)();
370357

@@ -376,8 +363,6 @@ void retro_deinit(void)
376363
#ifdef PERF_TEST
377364
perf_cb.perf_log();
378365
#endif
379-
380-
381366
}
382367

383368
uint32_t S9xReadJoypad(int port)
@@ -421,12 +406,10 @@ static void check_variables(void)
421406
}
422407
}
423408

424-
425409
#ifdef PSP
426410
#define FRAMESKIP
427411
#endif
428412

429-
//#define NO_VIDEO_OUTPUT
430413
static float samples_to_play = 0.0;
431414
void retro_run(void)
432415
{
@@ -492,7 +475,6 @@ void retro_run(void)
492475

493476
sceGuFinish();
494477

495-
496478
video_cb(texture_vram_p, IPPU.RenderedScreenWidth, IPPU.RenderedScreenHeight,
497479
GFX.Pitch);
498480
#else
@@ -509,23 +491,6 @@ void retro_run(void)
509491
IPPU.RenderThisFrame = true;
510492
}
511493
#endif
512-
513-
}
514-
515-
void S9xGenerateSound()
516-
{
517-
518-
}
519-
520-
521-
void S9xProcessSound(unsigned int samples)
522-
{
523-
524-
}
525-
526-
void S9xLoadSDD1Data()
527-
{
528-
529494
}
530495

531496
bool S9xReadMousePosition(int which1, int* x, int* y, uint32_t* buttons)
@@ -596,6 +561,7 @@ unsigned retro_get_region(void)
596561
{
597562
return Settings.PAL ? RETRO_REGION_PAL : RETRO_REGION_NTSC;
598563
}
564+
599565
void retro_get_system_info(struct retro_system_info* info)
600566
{
601567
#ifdef LOAD_FROM_MEMORY_TEST
@@ -646,7 +612,6 @@ void retro_reset(void)
646612
S9xReset();
647613
}
648614

649-
650615
size_t retro_serialize_size(void)
651616
{
652617
return sizeof(CPU) + sizeof(ICPU) + sizeof(PPU) + sizeof(DMA) +
@@ -715,6 +680,7 @@ bool retro_serialize(void* data, size_t size)
715680

716681
return true;
717682
}
683+
718684
bool retro_unserialize(const void* data, size_t size)
719685
{
720686
const uint8_t* buffer = data;
@@ -906,7 +872,6 @@ static void init_descriptors(void)
906872
}
907873

908874
bool retro_load_game(const struct retro_game_info* game)
909-
910875
{
911876
CPU.Flags = 0;
912877
init_descriptors();
@@ -939,9 +904,9 @@ bool retro_load_game_special(unsigned game_type,
939904
{
940905
return false;
941906
}
907+
942908
void retro_unload_game(void)
943909
{
944-
945910
}
946911

947912
void* retro_get_memory_data(unsigned type)
@@ -953,20 +918,12 @@ void* retro_get_memory_data(unsigned type)
953918
case RETRO_MEMORY_SAVE_RAM:
954919
data = Memory.SRAM;
955920
break;
956-
case RETRO_MEMORY_RTC:
957-
#if 0
958-
data = RTCData.reg;
959-
#endif
960-
break;
961921
case RETRO_MEMORY_SYSTEM_RAM:
962922
data = Memory.RAM;
963923
break;
964924
case RETRO_MEMORY_VIDEO_RAM:
965925
data = Memory.VRAM;
966926
break;
967-
//case RETRO_MEMORY_ROM:
968-
// data = Memory.ROM;
969-
// break;
970927
default:
971928
break;
972929
}
@@ -986,17 +943,14 @@ size_t retro_get_memory_size(unsigned type)
986943
size = 0x20000;
987944
break;
988945
case RETRO_MEMORY_RTC:
989-
size = (Settings.SRTC || Settings.SPC7110RTC)?20:0;
946+
size = (Settings.SRTC || Settings.SPC7110RTC) ? 20 : 0;
990947
break;
991948
case RETRO_MEMORY_SYSTEM_RAM:
992949
size = 128 * 1024;
993950
break;
994951
case RETRO_MEMORY_VIDEO_RAM:
995952
size = 64 * 1024;
996953
break;
997-
//case RETRO_MEMORY_ROM:
998-
// data = Memory.CalculatedSize;
999-
// break;
1000954
default:
1001955
size = 0;
1002956
break;

‎source/65c816.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ typedef union
7070
uint8_t l, h;
7171
} B;
7272
#endif
73+
7374
uint16_t W;
7475
} pair;
7576

7677
typedef struct
7778
{
7879
uint8_t PB;
7980
uint8_t DB;
80-
pair P;
81-
pair A;
82-
pair D;
83-
pair S;
84-
pair X;
85-
pair Y;
81+
pair P;
82+
pair A;
83+
pair D;
84+
pair S;
85+
pair X;
86+
pair Y;
8687
uint16_t PC;
8788
} SRegisters;
8889

8990
#endif
90-

‎source/apu.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -422,19 +422,19 @@ void S9xFixEnvelope(int channel, uint8_t gain, uint8_t adsr1, uint8_t adsr2)
422422
// ADSR mode
423423
static unsigned long AttackRate [16] =
424424
{
425-
4100, 2600, 1500, 1000, 640, 380, 260, 160,
426-
96, 64, 40, 24, 16, 10, 6, 1
425+
4100u, 2600u, 1500u, 1000u, 640u, 380u, 260u, 160u,
426+
96u, 64u, 40u, 24u, 16u, 10u, 6u, 1u
427427
};
428428
static unsigned long DecayRate [8] =
429429
{
430-
1200, 740, 440, 290, 180, 110, 74, 37
430+
1200u, 740u, 440u, 290u, 180u, 110u, 74u, 37u
431431
};
432432
static unsigned long SustainRate [32] =
433433
{
434-
~0, 38000, 28000, 24000, 19000, 14000, 12000, 9400,
435-
7100, 5900, 4700, 3500, 2900, 2400, 1800, 1500,
436-
1200, 880, 740, 590, 440, 370, 290, 220,
437-
180, 150, 110, 92, 74, 55, 37, 18
434+
~0u, 38000u, 28000u, 24000u, 19000u, 14000u, 12000u, 9400u,
435+
7100u, 5900u, 4700u, 3500u, 2900u, 2400u, 1800u, 1500u,
436+
1200u, 880u, 740u, 590u, 440u, 370u, 290u, 220u,
437+
180u, 150u, 110u, 92u, 74u, 55u, 37u, 18u
438438
};
439439
// XXX: can DSP be switched to ADSR mode directly from GAIN/INCREASE/
440440
// DECREASE mode? And if so, what stage of the sequence does it start
@@ -470,17 +470,17 @@ void S9xFixEnvelope(int channel, uint8_t gain, uint8_t adsr1, uint8_t adsr2)
470470
{
471471
static unsigned long IncreaseRate [32] =
472472
{
473-
~0, 4100, 3100, 2600, 2000, 1500, 1300, 1000,
474-
770, 640, 510, 380, 320, 260, 190, 160,
475-
130, 96, 80, 64, 48, 40, 32, 24,
476-
20, 16, 12, 10, 8, 6, 4, 2
473+
~0u, 4100u, 3100u, 2600u, 2000u, 1500u, 1300u, 1000u,
474+
770u, 640u, 510u, 380u, 320u, 260u, 190u, 160u,
475+
130u, 96u, 80u, 64u, 48u, 40u, 32u, 24u,
476+
20u, 16u, 12u, 10u, 8u, 6u, 4u, 2u
477477
};
478478
static unsigned long DecreaseRateExp [32] =
479479
{
480-
~0, 38000, 28000, 24000, 19000, 14000, 12000, 9400,
481-
7100, 5900, 4700, 3500, 2900, 2400, 1800, 1500,
482-
1200, 880, 740, 590, 440, 370, 290, 220,
483-
180, 150, 110, 92, 74, 55, 37, 18
480+
~0u, 38000u, 28000u, 24000u, 19000u, 14000u, 12000u, 9400u,
481+
7100u, 5900u, 4700u, 3500u, 2900u, 2400u, 1800u, 1500u,
482+
1200u, 880u, 740u, 590u, 440u, 370u, 290u, 220u,
483+
180u, 150u, 110u, 92u, 74u, 55u, 37u, 18u
484484
};
485485
if (gain & 0x40)
486486
{

‎source/apu.h‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@
1010

1111
typedef struct
1212
{
13-
uint8_t* PC;
13+
uint8_t* PC;
1414
SAPURegisters Registers;
15-
uint8_t* RAM;
16-
uint8_t* DirectPage;
17-
bool APUExecuting;
18-
uint8_t Bit;
19-
uint32_t Address;
20-
uint8_t* WaitAddress1;
21-
uint8_t* WaitAddress2;
22-
uint32_t WaitCounter;
23-
uint8_t _Carry;
24-
uint8_t _Zero;
25-
uint8_t _Overflow;
26-
uint32_t TimerErrorCounter;
27-
uint32_t Scanline;
28-
int32_t OneCycle;
29-
int32_t TwoCycles;
15+
uint8_t* RAM;
16+
uint8_t* DirectPage;
17+
bool APUExecuting;
18+
uint8_t Bit;
19+
uint32_t Address;
20+
uint8_t* WaitAddress1;
21+
uint8_t* WaitAddress2;
22+
uint32_t WaitCounter;
23+
uint8_t _Carry;
24+
uint8_t _Zero;
25+
uint8_t _Overflow;
26+
uint32_t TimerErrorCounter;
27+
uint32_t Scanline;
28+
int32_t OneCycle;
29+
int32_t TwoCycles;
3030
} SIAPU;
3131

3232
typedef struct
3333
{
3434
int32_t Cycles;
35-
bool ShowROM;
35+
bool ShowROM;
3636
uint8_t Flags;
3737
uint8_t KeyedChannels;
3838
uint8_t OutPorts [4];
3939
uint8_t DSP [0x80];
4040
uint8_t ExtraRAM [64];
4141
uint16_t Timer [3];
4242
uint16_t TimerTarget [3];
43-
bool TimerEnabled [3];
44-
bool TimerValueWritten [3];
43+
bool TimerEnabled [3];
44+
bool TimerValueWritten [3];
4545
} SAPU;
4646

4747
SAPU APU;
@@ -78,7 +78,6 @@ extern uint16_t S9xAPUCycles [256]; // Scaled cycle lengths
7878
extern uint16_t S9xAPUCycleLengths [256]; // Raw data.
7979
extern void (*S9xApuOpcodes [256])(void);
8080

81-
8281
#define APU_VOL_LEFT 0x00
8382
#define APU_VOL_RIGHT 0x01
8483
#define APU_P_LOW 0x02
@@ -130,4 +129,3 @@ extern void (*S9xApuOpcodes [256])(void);
130129
#define APU_EXECUTE() do{}while(0)
131130

132131
#endif
133-

0 commit comments

Comments
 (0)