1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
|
diff --git a/Commands/CAssemblerLabel.cpp b/Commands/CAssemblerLabel.cpp
index 3ca67dd..50ea7ae 100644
--- a/Commands/CAssemblerLabel.cpp
+++ b/Commands/CAssemblerLabel.cpp
@@ -1,6 +1,5 @@
#include "Commands/CAssemblerLabel.h"
-#include "Archs/ARM/Arm.h"
#include "Core/Common.h"
#include "Core/FileManager.h"
#include "Core/Misc.h"
@@ -26,12 +25,7 @@ CAssemblerLabel::CAssemblerLabel(const Identifier& name, const Identifier& origi
// does this need to be in validate?
if (label->getUpdateInfo())
- {
- if (&Architecture::current() != &Arm)
- label->setInfo(0);
- else
- label->setInfo(thumbMode.value_or(Arm.GetThumbMode()));
- }
+ label->setInfo(0);
}
CAssemblerLabel::CAssemblerLabel(const Identifier& name, const Identifier& originalName, Expression& value, std::optional<bool> thumbMode)
diff --git a/Commands/CDirectiveConditional.cpp b/Commands/CDirectiveConditional.cpp
index e2177bd..1170247 100644
--- a/Commands/CDirectiveConditional.cpp
+++ b/Commands/CDirectiveConditional.cpp
@@ -1,12 +1,9 @@
#include "Commands/CDirectiveConditional.h"
-#include "Archs/ARM/Arm.h"
#include "Core/Common.h"
#include "Core/Misc.h"
#include "Util/Util.h"
-extern CArmArchitecture Arm;
-
CDirectiveConditional::CDirectiveConditional(ConditionType type)
{
this->type = type;
diff --git a/Core/Assembler.cpp b/Core/Assembler.cpp
index b1d006c..51d9c49 100644
--- a/Core/Assembler.cpp
+++ b/Core/Assembler.cpp
@@ -1,11 +1,7 @@
#include "Core/Assembler.h"
-#include "Archs/ARM/Arm.h"
-#include "Archs/ARM/ArmExpressionFunctions.h"
#include "Archs/MIPS/Mips.h"
#include "Archs/MIPS/MipsExpressionFunctions.h"
-#include "Archs/SuperH/SuperH.h"
-#include "Archs/SuperH/ShExpressionFunctions.h"
#include "Commands/CAssemblerCommand.h"
#include "Core/Allocations.h"
#include "Core/Common.h"
@@ -21,9 +17,7 @@ bool encodeAssembly(std::unique_ptr<CAssemblerCommand> content, SymbolData& symD
{
bool Revalidate;
- Arm.Pass2();
Mips.Pass2();
- SuperH.Pass2();
ValidateState validation;
do // loop until everything is constant
@@ -50,9 +44,7 @@ bool encodeAssembly(std::unique_ptr<CAssemblerCommand> content, SymbolData& symD
Revalidate = content->Validate(validation);
- Arm.Revalidate();
Mips.Revalidate();
- SuperH.Revalidate();
if (Global.memoryMode)
g_fileManager->closeFile();
@@ -162,8 +154,6 @@ bool runArmips(ArmipsArguments& settings)
Global.FileInfo.LineNumber = 0;
Global.FileInfo.FileNum = 0;
- Arm.clear();
-
ExpressionFunctionHandler::instance().reset();
registerExpressionFunctions(ExpressionFunctionHandler::instance());
diff --git a/Parser/DirectivesParser.cpp b/Parser/DirectivesParser.cpp
index d20d401..483d18e 100644
--- a/Parser/DirectivesParser.cpp
+++ b/Parser/DirectivesParser.cpp
@@ -1,8 +1,6 @@
#include "Parser/DirectivesParser.h"
-#include "Archs/ARM/Arm.h"
#include "Archs/MIPS/Mips.h"
-#include "Archs/SuperH/SuperH.h"
#include "Commands/CAssemblerLabel.h"
#include "Commands/CDirectiveArea.h"
#include "Commands/CDirectiveConditional.h"
@@ -432,51 +430,6 @@ std::unique_ptr<CAssemblerCommand> parseDirectiveMipsArch(Parser& parser, int fl
return nullptr;
}
-std::unique_ptr<CAssemblerCommand> parseDirectiveArmArch(Parser& parser, int flags)
-{
- Architecture::setCurrent(Arm);
-
- switch (flags)
- {
- case DIRECTIVE_ARM_GBA:
- Arm.SetThumbMode(true);
- Arm.setVersion(AARCH_GBA);
- return std::make_unique<ArchitectureCommand>(".gba\n.thumb", ".thumb");
- case DIRECTIVE_ARM_NDS:
- Arm.SetThumbMode(false);
- Arm.setVersion(AARCH_NDS);
- return std::make_unique<ArchitectureCommand>(".nds\n.arm", ".arm");
- case DIRECTIVE_ARM_3DS:
- Arm.SetThumbMode(false);
- Arm.setVersion(AARCH_3DS);
- return std::make_unique<ArchitectureCommand>(".3ds\n.arm", ".arm");
- case DIRECTIVE_ARM_BIG:
- Arm.SetThumbMode(false);
- Arm.setVersion(AARCH_BIG);
- return std::make_unique<ArchitectureCommand>(".arm.big\n.arm", ".arm");
- case DIRECTIVE_ARM_LITTLE:
- Arm.SetThumbMode(false);
- Arm.setVersion(AARCH_LITTLE);
- return std::make_unique<ArchitectureCommand>(".arm.little\n.arm", ".arm");
- }
-
- return nullptr;
-}
-
-std::unique_ptr<CAssemblerCommand> parseDirectiveShArch(Parser& parser, int flags)
-{
- Architecture::setCurrent(SuperH);
-
- switch (flags)
- {
- case DIRECTIVE_SH_SATURN:
- SuperH.setVersion(SHARCH_SATURN);
- return std::make_unique<ArchitectureCommand>(".saturn", "");
- }
-
- return nullptr;
-}
-
std::unique_ptr<CAssemblerCommand> parseDirectiveArea(Parser& parser, int flags)
{
std::vector<Expression> parameters;
@@ -820,15 +773,6 @@ const DirectiveMap directives = {
{ ".n64", { &parseDirectiveMipsArch, DIRECTIVE_MIPS_N64 } },
{ ".rsp", { &parseDirectiveMipsArch, DIRECTIVE_MIPS_RSP } },
- { ".gba", { &parseDirectiveArmArch, DIRECTIVE_ARM_GBA } },
- { ".nds", { &parseDirectiveArmArch, DIRECTIVE_ARM_NDS } },
- { ".3ds", { &parseDirectiveArmArch, DIRECTIVE_ARM_3DS } },
- { ".arm.big", { &parseDirectiveArmArch, DIRECTIVE_ARM_BIG } },
- { ".arm.little", { &parseDirectiveArmArch, DIRECTIVE_ARM_LITTLE } },
-
- { ".saturn", { &parseDirectiveShArch, DIRECTIVE_SH_SATURN } },
- { ".32x", { &parseDirectiveShArch, DIRECTIVE_SH_SATURN } },
-
{ ".area", { &parseDirectiveArea, 0 } },
{ ".autoregion", { &parseDirectiveAutoRegion, 0 } },
{ ".region", { &parseDirectiveArea, DIRECTIVE_AREA_SHARED } },
|
