Skip to content

Commit

Permalink
fix build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
JLaferri committed Sep 14, 2023
1 parent 84132ad commit b698534
Show file tree
Hide file tree
Showing 7 changed files with 1,116 additions and 41 deletions.
16 changes: 6 additions & 10 deletions External/Debug Inputs/DebugInputs.s
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.ifndef HEADER_DEBUG_INPUTS

################################################################################
# Constants
################################################################################
Expand Down Expand Up @@ -25,15 +27,6 @@
################################################################################
# Macros
################################################################################
.macro incrementByte reg, reg_address, offset, limit
lbz \reg, \offset(\reg_address)
addi \reg, \reg, 1
cmpwi \reg, \limit
blt 0f
li \reg, 0
0:
stb \reg, \offset(\reg_address)
.endm

# Calculates us difference from two ticks
.macro calcDiffUs reg_now, reg_ref
Expand All @@ -54,4 +47,7 @@ mulli r4, \reg_idx, 4
addi r4, r4, DIB_CIRCULAR_BUFFER
lwzx r4, \reg_dib, r4
calcDiffUs r3, r4
.endm
.endm

.endif
.set HEADER_DEBUG_INPUTS, 1
2 changes: 1 addition & 1 deletion External/Debug Inputs/LogFetchTime.asm
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ addi r4, r4, DIB_CIRCULAR_BUFFER
stwx r3, REG_DIB, r4

# Increment index
incrementByte r3, REG_DIB, DIB_FETCH_INDEX, CIRCULAR_BUFFER_COUNT
incrementByteInBuf r3, REG_DIB, DIB_FETCH_INDEX, CIRCULAR_BUFFER_COUNT

# Indicate ready, prevents other functions from running first. Only activate if currently inactive
lbz r3, DIB_ACTIVE_STATE(REG_DIB)
Expand Down
321 changes: 321 additions & 0 deletions Output/Console/GALE01r2.ini
Original file line number Diff line number Diff line change
Expand Up @@ -702,3 +702,324 @@ C03D000C FC020840
BA8100B0 800100E4
382100E0 7C0803A6
60000000 00000000

$Optional: Debug Game-Side Latency [Fizzi]
*Shows latency information on screen while in-game
C216E774 00000093 #External/Debug Inputs/InitOnGameStart.asm
48000410 4E800021
00000000 43480000
41C80000 000000FF
000000B4 E2E2E2FF
41200000 41880000
546F7461 6C204761
6D65204C 61673A20
25752075 730A0A00
506F6C6C 20436F75
6E743A20 25750A00
4D696E20 506F6C6C
20446966 663A2025
75207573 0A004D61
7820506F 6C6C2044
6966663A 20257520
75730A00 46657463
682D4665 7463683A
20257520 75730A00
506F6C6C 2D466574
63683A20 25752075
730A0050 6F6C6C2D
456E6769 6E653A20
25752075 730A0000
4E800021 4E800020
4E800021 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFF31
7FE802A6 83DF0000
83BE0006 887E0000
2C030001 40820128
7FA3EB78 3D808030
618C2BB0 7D8903A6
4E800421 7FA3EB78
38800000 38A00000
3D808030 618C2A3C
7D8903A6 4E800421
7FA3EB78 389F0020
80BE0056 3D808030
618C2D4C 7D8903A6
4E800421 7FA3EB78
389F0038 80BE006E
3D808030 618C2D4C
7D8903A6 4E800421
7FA3EB78 389F0048
80BE005A 3D808030
618C2D4C 7D8903A6
4E800421 7FA3EB78
389F005E 80BE005E
3D808030 618C2D4C
7D8903A6 4E800421
7FA3EB78 389F0074
80BE0062 3D808030
618C2D4C 7D8903A6
4E800421 7FA3EB78
389F0088 80BE0066
3D808030 618C2D4C
7D8903A6 4E800421
7FA3EB78 389F009B
80BE006A 3D808030
618C2D4C 7D8903A6
4E800421 3C608046
6063B6A0 88630008
2C030000 41820020
807E0012 3D808034
618C9CBC 7D8903A6
4E800421 38600002
987E0000 BA8100B0
800100E4 382100E0
7C0803A6 4E800020
7C0802A6 90010004
9421FF20 BE8100B0
4BFFFDCD 7FE802A6
38600020 3D808037
618CF1E4 7D8903A6
4E800421 7C681B78
3860001E 3880FF2E
38A0FFD8 38C00001
38E00001 3D808030
618C2834 7D8903A6
4E800421 7C7E1B78
806DB77C 7FC4F378
3D808030 618C2810
7D8903A6 4E800421
38600000 987E0026
7FC3F378 389F000C
3D808030 618C2B90
7D8903A6 4E800421
C03F0004 D03E0008
C03F0008 D03E000C
807F0000 93C30002
BA8100B0 800100E4
382100E0 7C0803A6
4E800020 7C0802A6
90010004 9421FF20
BE8100B0 4BFFFD11
7FE802A6 386003E8
3D808037 618CF1E4
7D8903A6 4E800421
7C681B78 3860001F
38800000 38A00000
38C0001D 38E00009
3D808030 618C2834
7D8903A6 4E800421
7C7E1B78 806DB77C
7FC4F378 3D808030
618C2810 7D8903A6
4E800421 38600000
987E0026 7FC3F378
389F0010 3D808030
618C2B90 7D8903A6
4E800421 7FC3F378
C03F0018 C05F001C
3D808030 618C2B10
7D8903A6 4E800421
7FC3F378 389F0014
3D808030 618C2B64
7D8903A6 4E800421
7FC3F378 3D808030
618C2AF0 7D8903A6
4E800421 807F0000
93C30006 38600013
38800014 38A00000
3D808039 618C01F0
7D8903A6 4E800421
4BFFFCE1 7C8802A6
38A00007 3D808038
618CFD54 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 4E800020
7C0802A6 90010004
9421FF20 BE8100B0
38600072 3D808037
618CF1E4 7D8903A6
4E800421 4BFFFBD1
7C8802A6 90640000
7C7E1B78 38800072
3D808000 618CC160
7D8903A6 4E800421
4BFFFDD1 4BFFFE89
4BFFFC59 7C6802A6
907E0012 3D808034
618C9BF0 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 C022A8C8
60000000 00000000
C21A4DEC 00000028 #External/Debug Inputs/LogEngineTime.asm
3C608048 80639D30
5463443E 2C030202
40820124 3C608048
80639D60 2C030000
40810114 7C0802A6
90010004 9421FF20
BE8100B0 3D808034
618C7364 7D8903A6
4E800421 7C7E1B78
3C608016 6063E774
80830000 5485863E
7CA50774 54A5801E
5484043A 7C842B78
7C632214 83E30008
887F0000 2C030000
41820098 3C80804C
60841FAC 80640000
547C073E 54630036
90640000 3D808034
618CC408 7D8903A6
4E800421 1C9C0004
38840016 7C9F202E
7C641850 1C63000C
3C808000 608400FC
80840000 38A003E8
7C842B96 7C842B96
7C632396 7C7D1B78
93BF006A 807F0002
9B810008 9B810009
9B81000A 80810008
54842026 608400FF
90810008 38810008
3D808030 618C2B90
7D8903A6 4E800421
7FC3F378 3D808034
618C738C 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 800D9368
60000000 00000000
C2376A88 0000002D #External/Debug Inputs/LogFetchTime.asm
3C608048 80639D30
5463443E 2C030202
40820150 3C608047
60639D64 80630000
2C030000 4082013C
7C0802A6 90010004
9421FF20 BE8100B0
3D808034 618C7364
7D8903A6 4E800421
7C7E1B78 3C608016
6063E774 80830000
5485863E 7CA50774
54A5801E 5484043A
7C842B78 7C632214
83E30008 806100DC
54638036 889F0001
7C632378 5463803E
906100DC 807F000A
889F0001 1C840004
38840016 7C7F212E
887F0001 38630001
2C030010 41800008
38600000 987F0001
887F0000 2C030000
4082000C 38600001
987F0000 3D808034
618CC408 7D8903A6
4E800421 7C7D1B78
809F000E 93BF000E
7C64E850 1C63000C
3C808000 608400FC
80840000 38A003E8
7C842B96 7C842B96
7C632396 907F0062
807F000A 7C63E850
1C63000C 3C808000
608400FC 80840000
38A003E8 7C842B96
7C842B96 7C632396
907F0066 7FC3F378
3D808034 618C738C
7D8903A6 4E800421
BA8100B0 800100E4
382100E0 7C0803A6
881F0002 00000000
C2349A28 00000025 #External/Debug Inputs/LogPollTime.asm
3C608048 80639D30
5463443E 2C030202
4082010C 3C608047
60639D64 80630000
2C030000 408200F8
7C0802A6 90010004
9421FF20 BE8100B0
3D808034 618C7364
7D8903A6 4E800421
7C7E1B78 3C608016
6063E774 80830000
5485863E 7CA50774
54A5801E 5484043A
7C842B78 7C632214
83E30008 807F006E
38630001 907F006E
3D808034 618CC408
7D8903A6 4E800421
809F000A 907F000A
7C641850 1C63000C
3C808000 608400FC
80840000 38A003E8
7C842B96 7C842B96
7C632396 7C7D1B78
807F006E 5463063F
41820028 807F005A
7C1D1800 40800008
93BF005A 807F005E
7C1D1800 40810008
93BF005E 4800000C
93BF005A 93BF005E
7FC3F378 3D808034
618C738C 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 80B80000
60000000 00000000
C2375C14 0000002C #External/Debug Inputs/LogScanoutTime.asm
48000034 5464C63E
5463463E 7C032000
4182000C 3860FFFF
48000018 3863FFF1
1C630006 38800005
7C632396 5463E73E
4E800020 3C608048
80639D30 5463443E
2C030202 40820110
3C608047 60639D64
80630000 2C030000
408200FC 7C0802A6
90010004 9421FF20
BE8100B0 3D808034
618C7364 7D8903A6
4E800421 7C7E1B78
3C608016 6063E774
80830000 5485863E
7CA50774 54A5801E
5484043A 7C842B78
7C632214 83E30008
887F0000 2C030000
41820080 3C60804A
60638B10 80630000
38800000 7C0323AC
7C0004AC 4C00012C
83430000 7F43D378
4BFFFF2D 2C030000
41800050 7C7C1B78
3D808034 618CC408
7D8903A6 4E800421
1C9C0004 38840016
7C9F202E 7C641850
1C63000C 3C808000
608400FC 80840000
38A003E8 7C842B96
7C842B96 7C632396
7C7D1B78 93BF0056
7FC3F378 3D808034
618C738C 7D8903A6
4E800421 BA8100B0
800100E4 382100E0
7C0803A6 80010024
60000000 00000000
Binary file modified Output/Console/g_core.bin
Binary file not shown.
Binary file modified Output/Console/g_core_porta.bin
Binary file not shown.
Loading

0 comments on commit b698534

Please sign in to comment.