Skip to content
GitLab
Commit 619f04f2 authored by Donald Haase's avatar Donald Haase
Browse files

Clean up some extraneous files

parent aefcc6bd
Expand all Hide whitespace changes
Inline Side-by-side
Makefile
View file @ 619f04f2
......@@ -5,7 +5,7 @@ TARGET = superfamicast.elf
OBJS = main.o 2xsai.o apu.o apudebug.o c4.o c4emu.o cheats2.o clip.o cpu.o data.o debug.o dma.o
OBJS += dsp1.o fxdbg.o fxemu.o fxinst.o gfx.o globals.o loadzip.o memmap.o netplay.o obc1.o ppu.o screenshot.o
OBJS += sdd1.o sdd1emu.o server.o seta010.o seta011.o seta018.o seta.o snaporig.o snapshot.o snes9x.o soundux.o spc700.o
OBJS += spc7110.o spc.o spccycles.o srtc.o tile.o explode.o unreduce.o unshrink.o unzip.o cheats.o scanf.o dc_utils.o
OBJS += spc7110.o spc.o spccycles.o srtc.o tile.o explode.o unreduce.o unshrink.o unzip.o cheats.o dc_utils.o
OBJS += dc_vmu.o XML.o dc_menu.o pvr_texture.o dc_controller.o dc_mouse.o dc_file_browser.o test.o sa1.o scherzo_snd_stream.o
OBJS += offsets.o romdisk.o
......
gcc_asm_sh4_tips.txt deleted 100644 → 0
View file @ aefcc6bd
This diff is collapsed.
output.txt deleted 100644 → 0
View file @ aefcc6bd
Console enabled
Cdfs redirection enabled
Upload <superfamicast.elf>
File format is elf32-shl, start address is 0x8c010000
Section .text, lma 0x8c010000, size 927168
Section .rodata, lma 0x8c0f25c0, size 151176
Section .data, lma 0x8c1174e0, size 97976
Section .ctors, lma 0x8c12f398, size 24
Section .dtors, lma 0x8c12f3b0, size 20
transferred at 568566.455653 bytes / sec
Executing at <0x8c010000>
Sending execute command (0x8c010000, console=1, cdfsredir=1)...executing
--
KallistiOS ##version##: Fri May 14 11:11:56 CDT 2004
Administrator@earthworm:c:/cygwin/usr/local/dc/kos-svn/kos
maple: active drivers:
PuruPuru (Vibration) Pack: JumpPack
VMU Driver: Clock, LCD, MemoryCard
Mouse Driver: Mouse
Keyboard Driver: Keyboard
Controller Driver: Controller
DMA Buffer at ac2527a0
vid_set_mode: 640x480 NTSC
fs_romdisk: mounting image at 0x8c0fbaa8 at /rd
dc-load console support enabled
maple: attached devices:
A0: Dreamcast Controller (01000000: Controller)
A1: Visual Memory (0e000000: Clock, LCD, MemoryCard)
A2: Puru Puru Pack (00010000: JumpPack)
START OFFSETS
//SCPUState
#define Flags @(0,r12)
#define BranchSkip @(4,r12)
#define NMIActive @(5,r12)
#define IRQActive @(6,r12)
#define WaitingForInterrupt @(7,r12)
#define InDMA @(8,r12)
#define WhichEvent @(9,r12)
#define PCS @(12,r12)
#define PCBase @(16,r12)
#define PCAtOpcodeStart @(20,r12)
#define WaitAddress @(24,r12)
#define WaitCounter @(28,r12)
#define Cycles @(32,r12)
#define NextEvent @(36,r12)
#define V_Counter @(40,r12)
#define MemSpeed @(44,r12)
#define MemSpeedx2 @(48,r12)
#define FastROMSpeed @(52,r12)
#define AutoSaveTimer @(64,r12)
#define SRAMModified @(10,r12)
#define NMITriggerPoint @(68,r12)
#define TriedInterleavedMode2 @(72,r12)
#define BRKTriggered @(11,r12)
#define NMICycleCount @(56,r12)
#define IRQCycleCount @(60,r12)
//SRegisters
#define PB @(0,r11)
#define DB @(1,r11)
#define PP @(2,r11)
#define PL @(2,r11)
#define PH @(3,r11)
#define AA @(4,r11)
#define AL @(4,r11)
#define AH @(5,r11)
#define DD @(6,r11)
#define DL @(6,r11)
#define DH @(7,r11)
#define SS @(8,r11)
#define SL @(8,r11)
#define SH @(9,r11)
#define XX @(10,r11)
#define XL @(10,r11)
#define XH @(11,r11)
#define YY @(12,r11)
#define YL @(12,r11)
#define YH @(13,r11)
#define PCR @(14,r11)
//CMemory
#define RAM _Memory + 0
#define ROM _Memory + 4
#define VRAM _Memory + 8
#define SRAM _Memory + 12
#define BWRAM _Memory + 16
#define FillRAM _Memory + 20
#define C4RAM _Memory + 24
#define HiROM _Memory + 28
#define LoROM _Memory + 29
#define SRAMMask _Memory + 32
#define SRAMSize _Memory + 36
#define Map _Memory + 40
#define WriteMap _Memory + 16424
#define MemorySpeed _Memory + 32808
#define BlockIsRAM _Memory + 36904
#define BlockIsROM _Memory + 41000
#define ROMFilename _Memory + 53368
//SIAPU
#define APUPCS @(8,r1)
#define APURAM @(12,r1)
#define APUExecuting @(0,r1)
#define APUDirectPage @(16,r1)
#define APUBit @(1,r1)
#define APUAddress @(20,r1)
#define APUWaitAddress1 @(24,r1)
#define APUWaitAddress2 @(28,r1)
#define APUWaitCounter @(32,r1)
#define APUShadowRAM @(36,r1)
#define APUCachedSamples @(40,r1)
#define APU_Carry @(2,r1)
#define APU_Zero @(3,r1)
#define APU_Overflow @(4,r1)
#define APUTimerErrorCounter @(44,r1)
//SAPU
#define APUCycles @(0,r1)
#define APUShowROM @(4,r1)
#define APUFlags @(5,r1)
#define APUKeyedChannels @(6,r1)
#define APUOutPorts @(7,r1)
#define APUDSP @(11,r1)
#define APUExtraRAM 139
#define APUTimer 204
#define APUTimerTarget 210
#define APUTimerEnabled 216
#define TimerValueWritten 219
//SICPU
#define CPUSpeed @(0,r1)
#define CPUOpcodes @(4,r1)
#define _Carry @(8,r1)
#define _Zero @(9,r1)
#define _Negative @(10,r1)
#define _Overflow @(11,r1)
#define ShiftedDB @(20,r1)
#define ShiftedPB @(16,r1)
#define CPUExecuting @(12,r1)
#define Scanline @(28,r1)
#define Frame @(24,r1)
//SSettings
#define APUEnabled @(0,r1)
#define Shutdown @(1,r1)
#define SoundSkipMethod @(2,r1)
#define H_Max @(4,r1)
#define HBlankStart @(8,r1)
#define CyclesPercentage @(12,r1)
#define DisableIRQ @(16,r1)
#define Paused @(17,r1)
#define PAL @(3,r1)
#define SoundSync @(108,r1)
#define SA1Enabled @(82,r1)
#define SuperFXEnabled @(80,r1)
//SAPURegisters
#define ApuP @(0,r1)
#define ApuYA @(2,r1)
#define ApuA @(2,r1)
#define ApuY @(3,r1)
#define ApuX @(4,r1)
#define ApuS @(5,r1)
#define ApuPC @(6,r1)
#define APUPCR @(6,r1)
//SPPU
#define BGMode @(0,r1)
#define BG3Priority @(1,r1)
#define Brightness @(2,r1)
#define GHight @(20,r1)
#define GInc @(21,r1)
#define GAddress @(22,r1)
#define GMask1 @(24,r1)
#define GFullGraphicCount @(26,r1)
#define GShift @(28,r1)
#define CGFLIP @(78,r1)
#define CGDATA @(80,r1)
#define FirstSprite @(10,r1)
#define LastSprite @(592,r1)
#define OBJ @(594,r1)
#define OAMPriorityRotation @(2130,r1)
#define OAMAddr @(4,r1)
#define OAMFlip @(3,r1)
#define OAMTileAddress @(2132,r1)
#define IRQVBeamPos @(16,r1)
#define IRQHBeamPos @(2134,r1)
#define VBeamPosLatched @(2136,r1)
#define HBeamPosLatched @(2138,r1)
#define HBeamFlip @(2140,r1)
#define VBeamFlip @(2141,r1)
#define HVBeamCounterLatched @(11,r1)
#define MatrixA @(2142,r1)
#define MatrixB @(2144,r1)
#define MatrixC @(2146,r1)
#define MatrixD @(2148,r1)
#define CentreX @(2150,r1)
#define CentreY @(2152,r1)
#define Joypad1ButtonReadPos @(2154,r1)
#define Joypad2ButtonReadPos @(2155,r1)
#define CGADD @(2156,r1)
#define FixedColourGreen @(2158,r1)
#define FixedColourRed @(2157,r1)
#define FixedColourBlue @(2159,r1)
#define SavedOAMAddr @(6,r1)
#define ScreenHeight @(8,r1)
#define WRAM @(2160,r1)
#define BG_Forced @(2164,r1)
#define ForcedBlanking @(14,r1)
#define OBJThroughMain @(2165,r1)
#define OBJThroughSub @(2166,r1)
#define OBJSizeSelect @(2167,r1)
#define OBJNameBase @(2168,r1)
#define OAMReadFlip @(2171,r1)
#define OAMData @(2172,r1)
#define VTimerEnabled @(12,r1)
#define HTimerEnabled @(13,r1)
#define HTimerPosition @(18,r1)
#define Mosaic @(2716,r1)
#define BGMosaic @(2717,r1)
#define Mode7HFlip @(2721,r1)
#define Mode7VFlip @(2722,r1)
#define Mode7Repeat @(2723,r1)
#define Window1Left @(2724,r1)
#define Window1Right @(2725,r1)
#define Window2Left @(2726,r1)
#define Window2Right @(2727,r1)
#define ClipWindowOverlapLogic @(2734,r1)
#define ClipWindow1Enable @(2740,r1)
#define ClipWindow2Enable @(2746,r1)
#define ClipWindow1Inside @(2752,r1)
#define ClipWindow2Inside @(2758,r1)
#define RecomputeClipWindows @(2764,r1)
#define CGFLIPRead @(2765,r1)
#define OBJNameSelect @(2766,r1)
#define Need16x8Mulitply @(2768,r1)
#define Joypad3ButtonReadPos @(2769,r1)
#define MouseSpeed @(2770,r1)
#define RangeTimeOver @(2131,r1)
//InternalPPU
#define ColorsChanged @(0,r1)
#define HDMA @(1,r1)
#define HDMAStarted @(2,r1)
#define MaxBrightness @(3,r1)
#define LatchedBlanking @(4,r1)
#define OBJChanged @(5,r1)
#define RenderThisFrame @(6,r1)
#define SkippedFrames @(20,r1)
#define FrameSkip @(24,r1)
#define TileCache @(28,r1)
#define TileCached @(40,r1)
#define FirstVRAMRead @(52,r1)
#define Interlace @(54,r1)
#define DoubleWidthPixels @(56,r1)
#define RenderedScreenHeight @(60,r1)
#define RenderedScreenWidth @(64,r1)
#define Red @(68,r1)
#define Green @(1092,r1)
#define Blue @(2116,r1)
#define XB @(3140,r1)
#define ScreenColors @(3144,r1)
#define PreviousLine @(3656,r1)
#define CurrentLine @(3660,r1)
#define Joypads @(3668,r1)
#define SuperScope @(3688,r1)
#define Mouse @(3692,r1)
#define PrevMouseX @(3700,r1)
#define PrevMouseY @(3708,r1)
#define Clip @(3716,r1)
//SSA1
#define SA1Opcodes @(0,SA1REG)
#define SA1_Carry @(4,SA1REG)
#define SA1_Zero @(5,SA1REG)
#define SA1_Negative @(6,SA1REG)
#define SA1_Overflow @(7,SA1REG)
#define SA1CPUExecuting @(8,SA1REG)
#define SA1ShiftedPB @(16,SA1REG)
#define SA1ShiftedDB @(20,SA1REG)
#define SA1Flags @(24,SA1REG)
#define SA1Executing @(9,SA1REG)
#define SA1NMIActive @(10,SA1REG)
#define SA1IRQActive @(11,SA1REG)
#define SA1WaitingForInterrupt @(12,SA1REG)
#define SA1PCS @(28,SA1REG)
#define SA1PCBase @(32,SA1REG)
#define SA1PCAtOpcodeStart @(40,SA1REG)
#define SA1WaitAddress @(44,SA1REG)
#define SA1WaitCounter @(48,SA1REG)
#define SA1WaitByteAddress1 @(52,SA1REG)
#define SA1WaitByteAddress2 @(56,SA1REG)
#define SA1BWRAM @(36,SA1REG)
#define SA1Map @(60,SA1REG)
#define SA1WriteMap @(16444,SA1REG)
#define SA1op1 @(32828,SA1REG)
#define SA1op2 @(32830,SA1REG)
#define SA1arithmetic_op @(32832,SA1REG)
#define SA1sum @(32836,SA1REG)
#define SA1overflow @(32844,SA1REG)
#define VirtualBitmapFormat @(32845,SA1REG)
#define SA1_in_char_dma @(32846,SA1REG)
#define SA1variable_bit_pos @(32847,SA1REG)
//SSA1Registers
#define SA1PB @(0,r11)
#define SA1DB @(1,r11)
#define SA1PP @(2,r11)
#define SA1PL @(2,r11)
#define SA1PH SA1PL + 1
#define SA1AA @(4,r11)
#define SA1AL @(4,r11)
#define SA1AH SA1AL + 1
#define SA1DD @(6,r11)
#define SA1DL @(6,r11)
#define SA1DH SA1DL + 1
#define SA1SS @(8,r11)
#define SA1SL @(8,r11)
#define SA1SH SA1SL + 1
#define SA1XX @(10,r11)
#define SA1XL @(10,r11)
#define SA1XH SA1XL + 1
#define SA1YY @(12,r11)
#define SA1YL @(12,r11)
#define SA1YH SA1YL + 1
#define SA1PCR @(14,r11)
//Other stuff
#define S9xGetByte @(4,r14)
#define S9xSetByte @(8,r14)
#define S9xGetWord @(12,r14)
#define S9xSetWord @(16,r14)
#define S9xOpcode_IRQ @(20,r14)
#define S9xOpcode_NMI @(24,r14)
#define S9xSetPCBase @(28,r14)
#define ICPU @(32,r14)
#define IAPU @(36,r14)
#define APU @(40,r14)
#define SA1 @(44,r14)
#define APURegisters @(48,r14)
#define Settings @(52,r14)
#define IPPU @(56,r14)
#define PPU @(60,r14)
#define SA1Map_offs 60
#define SA1WriteMap_offs 16444
#define NMITriggerPoint_offs 68
END OFFSETS
vid_set_mode: 640x480 NTSC
pvr: disabling vertical scaling for VGA
pvr_mem_stats():
max system bytes = 0
system bytes = 0
in use bytes = 0
max sbrk base: a4396700
pvr_mem_stats():
max system bytes = 264448
system bytes = 264448
in use bytes = 262232
max sbrk base: a43d7000
fnt->txr->w = 256, fnt->txr->h = 256
fs_iso9660: disc change detected
(joliet level 3 extensions detected)
pvr_wait_ready: timed out
scanf.c deleted 100644 → 0
View file @ aefcc6bd
#include <stdio.h>
#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
/* very limited vsscanf, sscanf support */
static int read_int(const char* from, int* idx)
{
int res = 0, i = *idx, negative = 0;
/* fprintf(stderr, "from[i]=%c\n", from[i]);*/
if (from[i] == '-')
{
i++;
negative = 1;
}
for (; from[i]>='0' && from[i]<='9'; i++)
{
/* fprintf(stderr, "from[i]=%c\n", from[i]);*/
res = (from[i] - '0') + 10*res;
}
*idx = i;
return negative ? -res : res;
}
int vsscanf(const char* str, const char* fmt, va_list params)
{
int sidx = 0, fidx = 0, cnt = 0, fmtlen = strlen(fmt);
while (fidx < fmtlen)
{
/* fprintf(stderr, "fidx=%d fmt[fidx]=%c\n", fidx, fmt[fidx]);*/
switch (fmt[fidx])
{
case '%':
fidx++;
switch (fmt[fidx])
{
case 'd':
case 'i':
{
int* ptrtoval = va_arg(params, int*);
fidx++;
*ptrtoval = read_int(str, &sidx);
cnt++;
}
break;
case 'c':
{
char* ptrtochar = va_arg(params, char*);
fidx++;
*ptrtochar = str[sidx++];
cnt++;
}
break;
case 's':
{
char* writeto = va_arg(params, char*);
int i = 0;
/* skip whitespace */
fidx++;
while (str[sidx]==' ' || str[sidx]=='\t' || str[sidx]=='\n') sidx++;
while (str[sidx]!=' ' && str[sidx]!='\t' && str[sidx]!='\n')
{
writeto[i++] = str[sidx++];
}
/* write terminating NUL */
writeto[i] = '\0';
cnt++;
}
break;
default:
fprintf(stderr, "Bad format character (%c)\n", fmt[fidx]);
exit(1);
}
break;
case ' ':
case '\t':
case '\n':
fidx++;
while (str[sidx]==' ' || str[sidx]=='\t' || str[sidx]=='\n') sidx++;
break;
default:
/* printf("str[sidx]=%d fmt[fidx]=%d\n", str[sidx], fmt[fidx]);*/
if (str[sidx++] != fmt[fidx++])
{
goto badmatch;
}
}
}
badmatch:
return cnt;
}
int sscanf(const char* str, const char* fmt, ...)
{
va_list params;
int ret;
va_start(params, fmt);
ret = vsscanf(str, fmt, params);
va_end(params);
return ret;
}
#ifdef TESTING
int main(void)
{
char f[255], c;
int i;
sscanf("S:80:/pc/home/whatever", "%c:%i:%s", &c, &i, f);
printf("c=%c\ni=%d\nf=%s\n", c, i, f);
return 0;
}
#endif
simple_optimization_experiments.txt deleted 100644 → 0
View file @ aefcc6bd
FPS ACTION
22 removed -fno-optimize-sibling-calls
22 again added -fno-optimize-sibling-calls, seemed slightly better
21 changed -O3 to -Os
23 added -fforce-addr
21 added -fmove-all-movables
24 removed -fno-strict-aliasing
22 added -funroll-loops
upload.sh deleted 100644 → 0
View file @ aefcc6bd
dcsend.sh superfamicast.elf data.iso
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment