mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 05:40:04 +00:00 
			
		
		
		
	Merge pull request #3229 from lioncash/decode
arm_dyncom_dec: Hide the decoding table from external view
This commit is contained in:
		
						commit
						1f36472fff
					
				
					 2 changed files with 25 additions and 25 deletions
				
			
		|  | @ -5,6 +5,31 @@ | ||||||
| #include "core/arm/dyncom/arm_dyncom_dec.h" | #include "core/arm/dyncom/arm_dyncom_dec.h" | ||||||
| #include "core/arm/skyeye_common/armsupp.h" | #include "core/arm/skyeye_common/armsupp.h" | ||||||
| 
 | 
 | ||||||
|  | namespace { | ||||||
|  | struct InstructionSetEncodingItem { | ||||||
|  |     const char* name; | ||||||
|  |     int attribute_value; | ||||||
|  |     int version; | ||||||
|  |     u32 content[21]; | ||||||
|  | }; | ||||||
|  | 
 | ||||||
|  | // ARM versions
 | ||||||
|  | enum { | ||||||
|  |     INVALID = 0, | ||||||
|  |     ARMALL, | ||||||
|  |     ARMV4, | ||||||
|  |     ARMV4T, | ||||||
|  |     ARMV5T, | ||||||
|  |     ARMV5TE, | ||||||
|  |     ARMV5TEJ, | ||||||
|  |     ARMV6, | ||||||
|  |     ARM1176JZF_S, | ||||||
|  |     ARMVFP2, | ||||||
|  |     ARMVFP3, | ||||||
|  |     ARMV6K, | ||||||
|  | }; | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // clang-format off
 | // clang-format off
 | ||||||
| const InstructionSetEncodingItem arm_instruction[] = { | const InstructionSetEncodingItem arm_instruction[] = { | ||||||
|     { "vmla", 5, ARMVFP2,      { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 6, 6, 0, 4, 4, 0 }}, |     { "vmla", 5, ARMVFP2,      { 23, 27, 0x1C, 20, 21, 0x0, 9, 11, 0x5, 6, 6, 0, 4, 4, 0 }}, | ||||||
|  |  | ||||||
|  | @ -9,28 +9,3 @@ | ||||||
| enum class ARMDecodeStatus { SUCCESS, FAILURE }; | enum class ARMDecodeStatus { SUCCESS, FAILURE }; | ||||||
| 
 | 
 | ||||||
| ARMDecodeStatus DecodeARMInstruction(u32 instr, int* idx); | ARMDecodeStatus DecodeARMInstruction(u32 instr, int* idx); | ||||||
| 
 |  | ||||||
| struct InstructionSetEncodingItem { |  | ||||||
|     const char* name; |  | ||||||
|     int attribute_value; |  | ||||||
|     int version; |  | ||||||
|     u32 content[21]; |  | ||||||
| }; |  | ||||||
| 
 |  | ||||||
| // ARM versions
 |  | ||||||
| enum { |  | ||||||
|     INVALID = 0, |  | ||||||
|     ARMALL, |  | ||||||
|     ARMV4, |  | ||||||
|     ARMV4T, |  | ||||||
|     ARMV5T, |  | ||||||
|     ARMV5TE, |  | ||||||
|     ARMV5TEJ, |  | ||||||
|     ARMV6, |  | ||||||
|     ARM1176JZF_S, |  | ||||||
|     ARMVFP2, |  | ||||||
|     ARMVFP3, |  | ||||||
|     ARMV6K, |  | ||||||
| }; |  | ||||||
| 
 |  | ||||||
| extern const InstructionSetEncodingItem arm_instruction[]; |  | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue