Skip to content

Preserve case of labels provided through -definelabel for -sym2 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sp1187 merged 1 commit into from
May 1, 2020
Merged

Preserve case of labels provided through -definelabel for -sym2 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Assembler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ bool runArmips(ArmipsArguments& settings)
Global.symbolTable.addLabels(settings.labels);
for (const LabelDefinition& label : settings.labels)
{
symData.addLabel(label.value, label.name);
symData.addLabel(label.value, label.originalName);
}

if (Logger::hasError())
Expand Down
1 change: 1 addition & 0 deletions Core/Assembler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ enum class ArmipsMode { FILE, MEMORY };

struct LabelDefinition
{
std::wstring originalName;
std::wstring name;
int64_t value;
};
Expand Down
2 changes: 2 additions & 0 deletions Core/SymbolTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ void SymbolTable::addLabels(const std::vector<LabelDefinition>& labels)
if (label == nullptr)
continue;

label->setOriginalName(def.originalName);

if (isLocalSymbol(def.name) == false)
Global.Section++;

Expand Down
4 changes: 2 additions & 2 deletions Main/CommandLineInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ static bool parseArguments(const StringList& arguments, ArmipsArguments& setting
{
LabelDefinition def;

def.name = arguments[argpos + 1];
def.originalName = arguments[argpos + 1];
def.name = def.originalName;
std::transform(def.name.begin(), def.name.end(), def.name.begin(), ::towlower);

int64_t value;
if (!stringToInt(arguments[argpos + 2], 0, arguments[argpos + 2].size(), value))
{
Logger::printError(Logger::Error, L"Invalid definelabel value '%s'\n", arguments[argpos + 2]);
printUsage(arguments[0]);
return false;
}
def.value = value;
Expand Down