PlainAssemblyParser: Support pushing assembly sizes and offsets

Author: cameel

test/libevmasm/PlainAssemblyParser.cpp

@@ -76,7 +76,7 @@ Json PlainAssemblyParser::parseAssembly(size_t _nestingLevel)
 		else if (assemblyJSON.contains(".data"))
 			BOOST_THROW_EXCEPTION(std::runtime_error(formatError("The code of an assembly must be specified before its subassemblies.")));
 
-		if (c_instructions.contains(currentToken().value))
+		if (c_instructions.contains(currentToken().value) || currentToken().value == "PUSHSIZE")
 		{
 			expectNoMoreArguments();
 			codeJSON.push_back({{"name", currentToken().value}});
@@ -90,6 +90,19 @@ Json PlainAssemblyParser::parseAssembly(size_t _nestingLevel)
 				expectNoMoreArguments();
 				codeJSON.push_back({{"name", "PUSH [tag]"}, {"value", tagID}});
 			}
+			else if (hasMoreTokens() && (nextToken().value == "[$]" || nextToken().value == "#[$]"))
+			{
+				std::string pushType = std::string(nextToken().value);
+				advanceToken();
+				std::string_view subassemblyID = expectArgument();
+				expectNoMoreArguments();
+
+				if (!subassemblyID.starts_with("0x"))
+					BOOST_THROW_EXCEPTION(std::runtime_error(formatError("The subassembly ID must be a hex number prefixed with '0x'.")));
+
+				subassemblyID.remove_prefix("0x"s.size());
+				codeJSON.push_back({{"name", "PUSH " + pushType}, {"value", subassemblyID}});
+			}
 			else
 			{
 				std::string_view immediateArgument = expectArgument();

test/libevmasm/PlainAssemblyParser.h

@@ -48,6 +48,8 @@ namespace solidity::evmasm::test
 /// - PUSH <hex value>
 /// - PUSH [tag] <tagID>
 /// - tag <tagID>
+/// - PUSH [$] <subassemblyID>
+/// - PUSH #[$] <subassemblyID>
 /// - .sub
 class PlainAssemblyParser
 {

test/libevmasm/evmAssemblyTests/isoltestTesting/pushsize.asm

@@ -0,0 +1,33 @@
+PUSHSIZE
+
+.sub
+    PUSHSIZE
+// ====
+// outputs: InputAssemblyJSON,Assembly,Bytecode,Opcodes,SourceMappings
+// ----
+// InputAssemblyJSON: {
+//     ".code": [
+//         {
+//             "name": "PUSHSIZE"
+//         }
+//     ],
+//     ".data": {
+//         "0": {
+//             ".code": [
+//                 {
+//                     "name": "PUSHSIZE"
+//                 }
+//             ]
+//         }
+//     }
+// }
+// Assembly:
+//   bytecodeSize
+// stop
+//
+// sub_0: assembly {
+//       bytecodeSize
+// }
+// Bytecode: 6003fe
+// Opcodes: PUSH1 0x3 INVALID
+// SourceMappings: :::-:0

test/libevmasm/evmAssemblyTests/isoltestTesting/pushsubsize.asm

@@ -0,0 +1,72 @@
+PUSH [$] 0x0000
+PUSH #[$] 0x0000
+
+.sub
+    PUSH [$] 0x0
+    PUSH #[$] 0x2
+
+    .sub
+    .sub
+    .sub
+// ====
+// outputs: InputAssemblyJSON,Assembly,Bytecode,Opcodes,SourceMappings
+// ----
+// InputAssemblyJSON: {
+//     ".code": [
+//         {
+//             "name": "PUSH [$]",
+//             "value": "0000"
+//         },
+//         {
+//             "name": "PUSH #[$]",
+//             "value": "0000"
+//         }
+//     ],
+//     ".data": {
+//         "0": {
+//             ".code": [
+//                 {
+//                     "name": "PUSH [$]",
+//                     "value": "0"
+//                 },
+//                 {
+//                     "name": "PUSH #[$]",
+//                     "value": "2"
+//                 }
+//             ],
+//             ".data": {
+//                 "0": {
+//                     ".code": []
+//                 },
+//                 "1": {
+//                     ".code": []
+//                 },
+//                 "2": {
+//                     ".code": []
+//                 }
+//             }
+//         }
+//     }
+// }
+// Assembly:
+//   dataOffset(sub_0)
+//   dataSize(sub_0)
+// stop
+//
+// sub_0: assembly {
+//       dataOffset(sub_0)
+//       dataSize(sub_2)
+//     stop
+//
+//     sub_0: assembly {
+//     }
+//
+//     sub_1: assembly {
+//     }
+//
+//     sub_2: assembly {
+//     }
+// }
+// Bytecode: 60056005fe60056000fe
+// Opcodes: PUSH1 0x5 PUSH1 0x5 INVALID PUSH1 0x5 PUSH1 0x0 INVALID
+// SourceMappings: :::-:0;