[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 10/24] disas/nanomips: Move typedefs etc to nanomips.cpp
From: |
Milica Lazarevic |
Subject: |
[PATCH v3 10/24] disas/nanomips: Move typedefs etc to nanomips.cpp |
Date: |
Mon, 12 Sep 2022 14:26:21 +0200 |
The following is moved from the nanomips.h to nanomips.cpp file:
- #include line
- typedefs
- enums
- definition of the Pool struct.
Header file nanomips.h will be deleted to be consistent with the rest of
the disas/ code.
Signed-off-by: Milica Lazarevic <milica.lazarevic@syrmia.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
disas/nanomips.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++++-
disas/nanomips.h | 57 ----------------------------------------------
2 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index 3b5e6d520f..7fed1abff0 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -36,7 +36,62 @@
#include <stdio.h>
#include <stdarg.h>
-#include "nanomips.h"
+#include <string>
+
+typedef int64_t int64;
+typedef uint64_t uint64;
+typedef uint32_t uint32;
+typedef uint16_t uint16;
+typedef uint64_t img_address;
+
+enum TABLE_ENTRY_TYPE {
+ instruction,
+ call_instruction,
+ branch_instruction,
+ return_instruction,
+ reserved_block,
+ pool,
+};
+
+enum TABLE_ATTRIBUTE_TYPE {
+ MIPS64_ = 0x00000001,
+ XNP_ = 0x00000002,
+ XMMS_ = 0x00000004,
+ EVA_ = 0x00000008,
+ DSP_ = 0x00000010,
+ MT_ = 0x00000020,
+ EJTAG_ = 0x00000040,
+ TLBINV_ = 0x00000080,
+ CP0_ = 0x00000100,
+ CP1_ = 0x00000200,
+ CP2_ = 0x00000400,
+ UDI_ = 0x00000800,
+ MCU_ = 0x00001000,
+ VZ_ = 0x00002000,
+ TLB_ = 0x00004000,
+ MVH_ = 0x00008000,
+ ALL_ATTRIBUTES = 0xffffffffull,
+};
+
+typedef struct Dis_info {
+ img_address m_pc;
+} Dis_info;
+
+typedef bool (*conditional_function)(uint64 instruction);
+typedef std::string (*disassembly_function)(uint64 instruction,
+ Dis_info *info);
+
+typedef struct Pool {
+ TABLE_ENTRY_TYPE type;
+ const struct Pool *next_table;
+ int next_table_size;
+ int instructions_size;
+ uint64 mask;
+ uint64 value;
+ disassembly_function disassembly;
+ conditional_function condition;
+ uint64 attributes;
+} Pool;
#define IMGASSERTONCE(test)
diff --git a/disas/nanomips.h b/disas/nanomips.h
index 75abe03bba..0fd7299900 100644
--- a/disas/nanomips.h
+++ b/disas/nanomips.h
@@ -23,61 +23,4 @@
#ifndef DISAS_NANOMIPS_H
#define DISAS_NANOMIPS_H
-#include <string>
-
-typedef int64_t int64;
-typedef uint64_t uint64;
-typedef uint32_t uint32;
-typedef uint16_t uint16;
-typedef uint64_t img_address;
-
-enum TABLE_ENTRY_TYPE {
- instruction,
- call_instruction,
- branch_instruction,
- return_instruction,
- reserved_block,
- pool,
-};
-
-enum TABLE_ATTRIBUTE_TYPE {
- MIPS64_ = 0x00000001,
- XNP_ = 0x00000002,
- XMMS_ = 0x00000004,
- EVA_ = 0x00000008,
- DSP_ = 0x00000010,
- MT_ = 0x00000020,
- EJTAG_ = 0x00000040,
- TLBINV_ = 0x00000080,
- CP0_ = 0x00000100,
- CP1_ = 0x00000200,
- CP2_ = 0x00000400,
- UDI_ = 0x00000800,
- MCU_ = 0x00001000,
- VZ_ = 0x00002000,
- TLB_ = 0x00004000,
- MVH_ = 0x00008000,
- ALL_ATTRIBUTES = 0xffffffffull,
-};
-
-typedef struct Dis_info {
- img_address m_pc;
-} Dis_info;
-
-typedef bool (*conditional_function)(uint64 instruction);
-typedef std::string (*disassembly_function)(uint64 instruction,
- Dis_info *info);
-
-typedef struct Pool {
- TABLE_ENTRY_TYPE type;
- const struct Pool *next_table;
- int next_table_size;
- int instructions_size;
- uint64 mask;
- uint64 value;
- disassembly_function disassembly;
- conditional_function condition;
- uint64 attributes;
-} Pool;
-
#endif
--
2.25.1
- [PATCH v3 01/24] disas/nanomips: Remove namespace img, (continued)
- [PATCH v3 01/24] disas/nanomips: Remove namespace img, Milica Lazarevic, 2022/09/12
- [PATCH v3 05/24] disas/nanomips: Remove helper methods from class, Milica Lazarevic, 2022/09/12
- [PATCH v3 06/24] disas/nanomips: Remove __cond methods from class, Milica Lazarevic, 2022/09/12
- [PATCH v3 03/24] disas/nanomips: Delete NMD class field, Milica Lazarevic, 2022/09/12
- [PATCH v3 04/24] disas/nanomips: Delete NMD class second field, Milica Lazarevic, 2022/09/12
- [PATCH v3 08/24] disas/nanomips: Remove Pool tables from the class, Milica Lazarevic, 2022/09/12
- [PATCH v3 07/24] disas/nanomips: Remove disasm methods from class, Milica Lazarevic, 2022/09/12
- [PATCH v3 09/24] disas/nanomips: Remove NMD class, Milica Lazarevic, 2022/09/12
- [PATCH v3 10/24] disas/nanomips: Move typedefs etc to nanomips.cpp,
Milica Lazarevic <=
- [PATCH v3 11/24] disas/nanomips: Delete nanomips.h, Milica Lazarevic, 2022/09/12
- [PATCH v3 12/24] disas/nanomips: Remove #inlcude <sstream>, Milica Lazarevic, 2022/09/12
- [PATCH v3 14/24] disas/nanomips: Delete wrapper functions, Milica Lazarevic, 2022/09/12
- [PATCH v3 13/24] disas/nanomips: Delete copy functions, Milica Lazarevic, 2022/09/12
- [PATCH v3 15/24] disas/nanomips: Replace std::string type, Milica Lazarevic, 2022/09/12
- [PATCH v3 16/24] disas/nanomips: Remove IMMEDIATE functions, Milica Lazarevic, 2022/09/12