summaryrefslogtreecommitdiff
path: root/Source/Core/DSPCore/Src/LabelMap.cpp
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-05-01 12:15:48 +0000
committernakeee <nakeee@gmail.com>2009-05-01 12:15:48 +0000
commit6cc8c0744b3e95e5c199b3598eeabcbfb82a2cc0 (patch)
tree57b755a02aee82d45c3931c749b879c063e3c493 /Source/Core/DSPCore/Src/LabelMap.cpp
parente39f0f9ce88229a94b2a034db0571545be58dc6a (diff)
DSP: Fixed case and some printing in asm
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3117 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore/Src/LabelMap.cpp')
-rw-r--r--Source/Core/DSPCore/Src/LabelMap.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DSPCore/Src/LabelMap.cpp b/Source/Core/DSPCore/Src/LabelMap.cpp
index 5b8ab38c96..abedeb6860 100644
--- a/Source/Core/DSPCore/Src/LabelMap.cpp
+++ b/Source/Core/DSPCore/Src/LabelMap.cpp
@@ -41,7 +41,7 @@ void LabelMap::RegisterLabel(const std::string &label, u16 lval, LabelType type)
if (GetLabelValue(label, &old_value) && old_value != lval)
{
printf("WARNING: Redefined label %s to %04x - old value %04x\n",
- label, lval, old_value);
+ label.c_str(), lval, old_value);
DeleteLabel(label);
}
labels.push_back(label_t(label, lval, type));
@@ -62,7 +62,7 @@ void LabelMap::DeleteLabel(const std::string &label)
bool LabelMap::GetLabelValue(const std::string &label, u16 *value, LabelType type) const
{
- for (int i = 0; i < labels.size(); i++)
+ for (u32 i = 0; i < labels.size(); i++)
{
if (!label.compare(labels[i].name))
{
@@ -70,7 +70,7 @@ bool LabelMap::GetLabelValue(const std::string &label, u16 *value, LabelType typ
*value = labels[i].addr;
return true;
} else {
- printf("WARNING: Wrong label type requested. %s\n", label);
+ printf("WARNING: Wrong label type requested. %s\n", label.c_str());
}
}
}