Merge commit '16a2cf3873e00fa08e587d1b05c9132d98c24f50' into back-to-imgui

2025-06-26 22:15:44 +02:00
parent 2ec3abbe14 16a2cf3873
commit e13270e41e
876 changed files with 168071 additions and 411897 deletions
--- a/external/capstone/arch/EVM/EVMDisassembler.c
+++ b/external/capstone/arch/EVM/EVMDisassembler.c
@@ -1,5 +1,6 @@
 /* Capstone Disassembly Engine */
 /* By Nguyen Anh Quynh, 2018 */
+/* By Andelf, 2025 */

 #include <string.h>
 #include <stddef.h> // offsetof macro
@@ -36,9 +37,9 @@ static const short opcodes[256] = {
 	EVM_INS_XOR,
 	EVM_INS_NOT,
 	EVM_INS_BYTE,
-	-1,
-	-1,
-	-1,
+	EVM_INS_SHL,
+	EVM_INS_SHR,
+	EVM_INS_SAR,
 	-1,
 	-1,
 	EVM_INS_SHA3,
@@ -79,11 +80,11 @@ static const short opcodes[256] = {
 	EVM_INS_NUMBER,
 	EVM_INS_DIFFICULTY,
 	EVM_INS_GASLIMIT,
-	-1,
-	-1,
-	-1,
-	-1,
-	-1,
+	EVM_INS_CHAINID,
+	EVM_INS_SELFBALANCE,
+	EVM_INS_BASEFEE,
+	EVM_INS_BLOBHASH,
+	EVM_INS_BLOBBASEFEE,
 	-1,
 	-1,
 	-1,
@@ -101,10 +102,10 @@ static const short opcodes[256] = {
 	EVM_INS_MSIZE,
 	EVM_INS_GAS,
 	EVM_INS_JUMPDEST,
-	-1,
-	-1,
-	-1,
-	-1,
+	EVM_INS_TLOAD,
+	EVM_INS_TSTORE,
+	EVM_INS_MCOPY,
+	EVM_INS_PUSH0,
 	EVM_INS_PUSH1,
 	EVM_INS_PUSH2,
 	EVM_INS_PUSH3,
@@ -254,7 +255,7 @@ static const short opcodes[256] = {
 	EVM_INS_CALLCODE,
 	EVM_INS_RETURN,
 	EVM_INS_DELEGATECALL,
-	EVM_INS_CALLBLACKBOX,
+	EVM_INS_CREATE2,
 	-1,
 	-1,
 	-1,
@@ -264,7 +265,7 @@ static const short opcodes[256] = {
 	-1,
 	EVM_INS_REVERT,
 	-1,
-	EVM_INS_SUICIDE,
+	EVM_INS_SELFDESTRUCT,
 };

 bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
@@ -326,6 +327,9 @@ bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
 			case EVM_INS_MULMOD:
 			case EVM_INS_EXP:
 			case EVM_INS_SIGNEXTEND:
+			case EVM_INS_SHL:
+			case EVM_INS_SHR:
+			case EVM_INS_SAR:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MATH;
 				MI->flat_insn->detail->groups_count++;
 				break;
@@ -335,6 +339,7 @@ bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
 			case EVM_INS_CALLDATACOPY:
 			case EVM_INS_CODECOPY:
 			case EVM_INS_EXTCODECOPY:
+			case EVM_INS_MCOPY:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MEM_WRITE;
 				MI->flat_insn->detail->groups_count++;
 				break;
@@ -346,16 +351,19 @@ bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
 			case EVM_INS_RETURN:
 			case EVM_INS_DELEGATECALL:
 			case EVM_INS_REVERT:
+			case EVM_INS_CREATE2:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_MEM_READ;
 				MI->flat_insn->detail->groups_count++;
 				break;

 			case EVM_INS_SSTORE:
+			case EVM_INS_TSTORE:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STORE_WRITE;
 				MI->flat_insn->detail->groups_count++;
 				break;

 			case EVM_INS_SLOAD:
+			case EVM_INS_TLOAD:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_STORE_READ;
 				MI->flat_insn->detail->groups_count++;
 				break;
@@ -367,7 +375,7 @@ bool EVM_getInstruction(csh ud, const uint8_t *code, size_t code_len,
 				break;

 			case EVM_INS_STOP:
-			case EVM_INS_SUICIDE:
+			case EVM_INS_SELFDESTRUCT:
 				MI->flat_insn->detail->groups[MI->flat_insn->detail->groups_count] = EVM_GRP_HALT;
 				MI->flat_insn->detail->groups_count++;
 				break;
--- a/external/capstone/arch/EVM/EVMMapping.c
+++ b/external/capstone/arch/EVM/EVMMapping.c
@@ -1,5 +1,6 @@
 /* Capstone Disassembly Engine */
 /* By Nguyen Anh Quynh, 2018 */
+/* By Andelf, 2025 */

 #ifdef CAPSTONE_HAS_EVM

@@ -73,9 +74,9 @@ static const name_map insn_name_maps[256] = {
 	{ EVM_INS_XOR, "xor" },
 	{ EVM_INS_NOT, "not" },
 	{ EVM_INS_BYTE, "byte" },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_SHL, "shl" },
+	{ EVM_INS_SHR, "shr" },
+	{ EVM_INS_SAR, "sar" },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_SHA3, "sha3" },
@@ -116,11 +117,11 @@ static const name_map insn_name_maps[256] = {
 	{ EVM_INS_NUMBER, "number" },
 	{ EVM_INS_DIFFICULTY, "difficulty" },
 	{ EVM_INS_GASLIMIT, "gaslimit" },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_CHAINID, "chainid" },
+	{ EVM_INS_SELFBALANCE, "selfbalance" },
+	{ EVM_INS_BASEFEE, "basefee" },
+	{ EVM_INS_BLOBHASH, "blobhash" },
+	{ EVM_INS_BLOBBASEFEE, "blobbasefee" },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_INVALID, NULL },
@@ -138,10 +139,10 @@ static const name_map insn_name_maps[256] = {
 	{ EVM_INS_MSIZE, "msize" },
 	{ EVM_INS_GAS, "gas" },
 	{ EVM_INS_JUMPDEST, "jumpdest" },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_INVALID, NULL },
+	{ EVM_INS_TLOAD, "tload" },
+	{ EVM_INS_TSTORE, "tstore" },
+	{ EVM_INS_MCOPY, "mcopy" },
+	{ EVM_INS_PUSH0, "push0" },
 	{ EVM_INS_PUSH1, "push1" },
 	{ EVM_INS_PUSH2, "push2" },
 	{ EVM_INS_PUSH3, "push3" },
@@ -291,7 +292,7 @@ static const name_map insn_name_maps[256] = {
 	{ EVM_INS_CALLCODE, "callcode" },
 	{ EVM_INS_RETURN, "return" },
 	{ EVM_INS_DELEGATECALL, "delegatecall" },
-	{ EVM_INS_CALLBLACKBOX, "callblackbox" },
+	{ EVM_INS_CREATE2, "create2" },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_INVALID, NULL },
@@ -301,7 +302,7 @@ static const name_map insn_name_maps[256] = {
 	{ EVM_INS_INVALID, NULL },
 	{ EVM_INS_REVERT, "revert" },
 	{ EVM_INS_INVALID, NULL },
-	{ EVM_INS_SUICIDE, "suicide" },
+	{ EVM_INS_SELFDESTRUCT, "selfdestruct" },
 };
 #endif

--- a/external/capstone/arch/EVM/EVMMappingInsn.inc
+++ b/external/capstone/arch/EVM/EVMMappingInsn.inc
@@ -1,5 +1,6 @@
 /* Capstone Disassembly Engine */
 /* By Nguyen Anh Quynh, 2018 */
+/* By Andelf, 2025 */

 { 0, 0, 0 }, // STOP
 { 2, 1, 3 }, // ADD
@@ -28,9 +29,9 @@
 { 2, 1, 3 }, // XOR
 { 1, 1, 3 }, // NOT
 { 2, 1, 3 }, // BYTE
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
+{ 2, 1, 3 }, // SHL
+{ 2, 1, 3 }, // SHR
+{ 2, 1, 3 }, // SAR
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 2, 1, 30 }, // SHA3
@@ -71,11 +72,11 @@
 { 0, 1, 2 }, // NUMBER
 { 0, 1, 2 }, // DIFFICULTY
 { 0, 1, 2 }, // GASLIMIT
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
+{ 0, 1, 2 }, // CHAINID
+{ 0, 1, 5 }, // SELFBALANCE
+{ 0, 1, 2 }, // BASEFEE
+{ 0, 1, 3 }, // BLOBHASH
+{ 0, 1, 2 }, // BLOBBASEFEE
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
@@ -93,10 +94,10 @@
 { 0, 1, 2 }, // MSIZE
 { 0, 1, 2 }, // GAS
 { 0, 0, 1 }, // JUMPDEST
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
-{ 0, 0, 0xffffffff }, // unused
+{ 1, 1, 100 }, // TLOAD
+{ 2, 0, 100 }, // TSTORE
+{ 3, 0, 3 }, // MCOPY
+{ 0, 1, 3 }, // PUSH0
 { 0, 1, 3 }, // PUSH1
 { 0, 1, 3 }, // PUSH2
 { 0, 1, 3 }, // PUSH3
@@ -242,18 +243,18 @@
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 3, 1, 32000 }, // CREATE
-{ 7, 1, 40 }, // CALL
-{ 7, 1, 40 }, // CALLCODE
+{ 7, 1, 100 }, // CALL
+{ 7, 1, 100 }, // CALLCODE
 { 2, 0, 0 }, // RETURN
-{ 6, 1, 40 }, // DELEGATECALL
-{ 7, 1, 40 }, // CALLBLACKBOX
+{ 6, 1, 100 }, // DELEGATECALL
+{ 4, 1, 32000 }, // CREATE2
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
-{ 6, 1, 40 }, // STATICCALL
+{ 6, 1, 100 }, // STATICCALL
 { 0, 0, 0xffffffff }, // unused
 { 0, 0, 0xffffffff }, // unused
 { 2, 0, 0 }, // REVERT
 { 0, 0, 0xffffffff }, // unused
-{ 1, 0, 0 }, // SUICIDE
+{ 1, 0, 5000 }, // SELFDESTRUCT