logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0003-GBA-Cheats-Use-defines-for-action-replay-constants.patch (5335B)

    

  1. From b913ec4e0b373863645fc9b06e36995fe06507a6 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sat, 7 Nov 2020 14:28:05 -0800
  4. Subject: [PATCH] GBA Cheats: Use defines for action replay constants
  6. ISO C requires that enum constants must be representable as int and
  7. have type int (C99 6.7.2.2p2 and 6.4.4.3p2). Some of these are
  8. larger than 0x7fffffff, so just use preprocessor defines instead.
  9. This changes the type of the constants from int to unsigned int.
  11. [0] https://port70.net/~nsz/c/c99/n1256.html#6.7.2.2p2
  12. [1] https://port70.net/~nsz/c/c99/n1256.html#6.4.4.3p2
  13. ---
  14.  include/mgba/internal/gba/cheats.h | 128 +++++++++++++----------------
  15.  src/gba/cheats/parv3.c             |   2 +-
  16.  2 files changed, 59 insertions(+), 71 deletions(-)
  18. diff --git a/include/mgba/internal/gba/cheats.h b/include/mgba/internal/gba/cheats.h
  19. index fe17af1a6..19de60319 100644
  20. --- a/include/mgba/internal/gba/cheats.h
  21. +++ b/include/mgba/internal/gba/cheats.h
  22. @@ -55,76 +55,64 @@ enum GBAGameSharkType {
  23.  	GSA_HOOK = 0xF
  24.  };
  25.  
  26. -enum GBAActionReplay3Condition {
  27. -	PAR3_COND_OTHER = 0x00000000,
  28. -	PAR3_COND_EQ = 0x08000000,
  29. -	PAR3_COND_NE = 0x10000000,
  30. -	PAR3_COND_LT = 0x18000000,
  31. -	PAR3_COND_GT = 0x20000000,
  32. -	PAR3_COND_ULT = 0x28000000,
  33. -	PAR3_COND_UGT = 0x30000000,
  34. -	PAR3_COND_AND = 0x38000000,
  35. -};
  36. -
  37. -enum GBAActionReplay3Width {
  38. -	PAR3_WIDTH_1 = 0x00000000,
  39. -	PAR3_WIDTH_2 = 0x02000000,
  40. -	PAR3_WIDTH_4 = 0x04000000,
  41. -	PAR3_WIDTH_FALSE = 0x06000000,
  42. -};
  43. -
  44. -enum GBAActionReplay3Action {
  45. -	PAR3_ACTION_NEXT = 0x00000000,
  46. -	PAR3_ACTION_NEXT_TWO = 0x40000000,
  47. -	PAR3_ACTION_BLOCK = 0x80000000,
  48. -	PAR3_ACTION_DISABLE = 0xC0000000,
  49. -};
  50. -
  51. -enum GBAActionReplay3Base {
  52. -	PAR3_BASE_ASSIGN = 0x00000000,
  53. -	PAR3_BASE_INDIRECT = 0x40000000,
  54. -	PAR3_BASE_ADD = 0x80000000,
  55. -	PAR3_BASE_OTHER = 0xC0000000,
  56. -
  57. -	PAR3_BASE_ASSIGN_1 = 0x00000000,
  58. -	PAR3_BASE_ASSIGN_2 = 0x02000000,
  59. -	PAR3_BASE_ASSIGN_4 = 0x04000000,
  60. -	PAR3_BASE_INDIRECT_1 = 0x40000000,
  61. -	PAR3_BASE_INDIRECT_2 = 0x42000000,
  62. -	PAR3_BASE_INDIRECT_4 = 0x44000000,
  63. -	PAR3_BASE_ADD_1 = 0x80000000,
  64. -	PAR3_BASE_ADD_2 = 0x82000000,
  65. -	PAR3_BASE_ADD_4 = 0x84000000,
  66. -	PAR3_BASE_HOOK = 0xC4000000,
  67. -	PAR3_BASE_IO_2 = 0xC6000000,
  68. -	PAR3_BASE_IO_3 = 0xC7000000,
  69. -};
  70. -
  71. -enum GBAActionReplay3Other {
  72. -	PAR3_OTHER_END = 0x00000000,
  73. -	PAR3_OTHER_SLOWDOWN = 0x08000000,
  74. -	PAR3_OTHER_BUTTON_1 = 0x10000000,
  75. -	PAR3_OTHER_BUTTON_2 = 0x12000000,
  76. -	PAR3_OTHER_BUTTON_4 = 0x14000000,
  77. -	PAR3_OTHER_PATCH_1 = 0x18000000,
  78. -	PAR3_OTHER_PATCH_2 = 0x1A000000,
  79. -	PAR3_OTHER_PATCH_3 = 0x1C000000,
  80. -	PAR3_OTHER_PATCH_4 = 0x1E000000,
  81. -	PAR3_OTHER_ENDIF = 0x40000000,
  82. -	PAR3_OTHER_ELSE = 0x60000000,
  83. -	PAR3_OTHER_FILL_1 = 0x80000000,
  84. -	PAR3_OTHER_FILL_2 = 0x82000000,
  85. -	PAR3_OTHER_FILL_4 = 0x84000000,
  86. -};
  87. -
  88. -enum {
  89. -	PAR3_COND = 0x38000000,
  90. -	PAR3_WIDTH = 0x06000000,
  91. -	PAR3_ACTION = 0xC0000000,
  92. -	PAR3_BASE = 0xC0000000,
  93. -
  94. -	PAR3_WIDTH_BASE = 25
  95. -};
  96. +#define PAR3_COND_OTHER 0x00000000
  97. +#define PAR3_COND_EQ 0x08000000
  98. +#define PAR3_COND_NE 0x10000000
  99. +#define PAR3_COND_LT 0x18000000
  100. +#define PAR3_COND_GT 0x20000000
  101. +#define PAR3_COND_ULT 0x28000000
  102. +#define PAR3_COND_UGT 0x30000000
  103. +#define PAR3_COND_AND 0x38000000
  104. +
  105. +#define PAR3_WIDTH_1 0x00000000
  106. +#define PAR3_WIDTH_2 0x02000000
  107. +#define PAR3_WIDTH_4 0x04000000
  108. +#define PAR3_WIDTH_FALSE 0x06000000
  109. +
  110. +#define PAR3_ACTION_NEXT 0x00000000
  111. +#define PAR3_ACTION_NEXT_TWO 0x40000000
  112. +#define PAR3_ACTION_BLOCK 0x80000000
  113. +#define PAR3_ACTION_DISABLE 0xC0000000
  114. +
  115. +#define PAR3_BASE_ASSIGN 0x00000000
  116. +#define PAR3_BASE_INDIRECT 0x40000000
  117. +#define PAR3_BASE_ADD 0x80000000
  118. +#define PAR3_BASE_OTHER 0xC0000000
  119. +
  120. +#define PAR3_BASE_ASSIGN_1 0x00000000
  121. +#define PAR3_BASE_ASSIGN_2 0x02000000
  122. +#define PAR3_BASE_ASSIGN_4 0x04000000
  123. +#define PAR3_BASE_INDIRECT_1 0x40000000
  124. +#define PAR3_BASE_INDIRECT_2 0x42000000
  125. +#define PAR3_BASE_INDIRECT_4 0x44000000
  126. +#define PAR3_BASE_ADD_1 0x80000000
  127. +#define PAR3_BASE_ADD_2 0x82000000
  128. +#define PAR3_BASE_ADD_4 0x84000000
  129. +#define PAR3_BASE_HOOK 0xC4000000
  130. +#define PAR3_BASE_IO_2 0xC6000000
  131. +#define PAR3_BASE_IO_3 0xC7000000
  132. +
  133. +#define PAR3_OTHER_END 0x00000000
  134. +#define PAR3_OTHER_SLOWDOWN 0x08000000
  135. +#define PAR3_OTHER_BUTTON_1 0x10000000
  136. +#define PAR3_OTHER_BUTTON_2 0x12000000
  137. +#define PAR3_OTHER_BUTTON_4 0x14000000
  138. +#define PAR3_OTHER_PATCH_1 0x18000000
  139. +#define PAR3_OTHER_PATCH_2 0x1A000000
  140. +#define PAR3_OTHER_PATCH_3 0x1C000000
  141. +#define PAR3_OTHER_PATCH_4 0x1E000000
  142. +#define PAR3_OTHER_ENDIF 0x40000000
  143. +#define PAR3_OTHER_ELSE 0x60000000
  144. +#define PAR3_OTHER_FILL_1 0x80000000
  145. +#define PAR3_OTHER_FILL_2 0x82000000
  146. +#define PAR3_OTHER_FILL_4 0x84000000
  147. +
  148. +#define PAR3_COND 0x38000000
  149. +#define PAR3_WIDTH 0x06000000
  150. +#define PAR3_ACTION 0xC0000000
  151. +#define PAR3_BASE 0xC0000000
  152. +
  153. +#define PAR3_WIDTH_BASE 25
  154.  
  155.  struct GBACheatHook {
  156.  	uint32_t address;
  157. diff --git a/src/gba/cheats/parv3.c b/src/gba/cheats/parv3.c
  158. index 4f3a89310..731de638e 100644
  159. --- a/src/gba/cheats/parv3.c
  160. +++ b/src/gba/cheats/parv3.c
  161. @@ -70,7 +70,7 @@ static void _parElseBlock(struct GBACheatSet* cheats) {
  162.  }
  163.  
  164.  static bool _addPAR3Cond(struct GBACheatSet* cheats, uint32_t op1, uint32_t op2) {
  165. -	enum GBAActionReplay3Condition condition = op1 & PAR3_COND;
  166. +	uint32_t condition = op1 & PAR3_COND;
  167.  	int width = 1 << ((op1 & PAR3_WIDTH) >> PAR3_WIDTH_BASE);
  168.  	if (width > 4) {
  169.  		// TODO: Always false conditions
  170. -- 
  171. 2.29.2