derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up the disassembly a little.

Browse Source 
--HG--
extra : convert_revision : 7bdf68f445b79b1b5dbcdfa5fa1005c68d03724c
This commit is contained in:
Gabe Black
2006-11-14 01:28:11 -05:00
parent 14cb2264c8
commit 6b95f24145
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/arch/sparc/isa/formats/mem/util.isa
View File

@@ -76,23 +76,26 @@ output decoder {{
{
std::stringstream response;
bool load = flags[IsLoad];
bool save = flags[IsStore];
bool store = flags[IsStore];
printMnemonic(response, mnemonic);
if(save)
if(store)
{
printReg(response, _srcRegIdx[0]);
printReg(response, _srcRegIdx[0]);
ccprintf(response, ", ");
}
ccprintf(response, "[ ");
printReg(response, _srcRegIdx[!save ? 0 : 1]);
ccprintf(response, " + ");
printReg(response, _srcRegIdx[!save ? 1 : 2]);
ccprintf(response, " ]");
ccprintf(response, "[");
if(_srcRegIdx[!store ? 0 : 1] != 0)
{
printSrcReg(response, !store ? 0 : 1);
ccprintf(response, " + ");
}
printSrcReg(response, !store ? 1 : 2);
ccprintf(response, "]");
if(load)
{
ccprintf(response, ", ");
printReg(response, _destRegIdx[0]);
printReg(response, _destRegIdx[0]);
}
return response.str();
@@ -108,19 +111,23 @@ output decoder {{
printMnemonic(response, mnemonic);
if(save)
{
printReg(response, _srcRegIdx[0]);
printReg(response, _srcRegIdx[0]);
ccprintf(response, ", ");
}
ccprintf(response, "[ ");
printReg(response, _srcRegIdx[!save ? 0 : 1]);
ccprintf(response, "[");
if(_srcRegIdx[!save ? 0 : 1] != 0)
{
printReg(response, _srcRegIdx[!save ? 0 : 1]);
ccprintf(response, " + ");
}
if(imm >= 0)
ccprintf(response, " + 0x%x ]", imm);
ccprintf(response, "0x%x]", imm);
else
ccprintf(response, " + -0x%x ]", -imm);
ccprintf(response, "-0x%x]", -imm);
if(load)
{
ccprintf(response, ", ");
printReg(response, _destRegIdx[0]);
printReg(response, _destRegIdx[0]);
}
return response.str();

19
src/arch/sparc/isa/formats/priv.isa
View File

@@ -153,8 +153,13 @@ output decoder {{
printMnemonic(response, mnemonic);
ccprintf(response, " ");
printSrcReg(response, 0);
ccprintf(response, ", ");
//If the first reg is %g0, don't print it.
//This improves readability
if(_srcRegIdx[0] != 0)
{
printSrcReg(response, 0);
ccprintf(response, ", ");
}
printSrcReg(response, 1);
ccprintf(response, ", %%%s", regName);
@@ -169,8 +174,14 @@ output decoder {{
printMnemonic(response, mnemonic);
ccprintf(response, " ");
printSrcReg(response, 0);
ccprintf(response, ", 0x%x, %%%s", imm, regName);
//If the first reg is %g0, don't print it.
//This improves readability
if(_srcRegIdx[0] != 0)
{
printSrcReg(response, 0);
ccprintf(response, ", ");
}
ccprintf(response, "0x%x, %%%s", imm, regName);
return response.str();
}