D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-01-15 04:13:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up asm code a bit.

Browse Source 
- Use vector instead of Array, reducing allocations.
 - Use vectors instead of deques since we only push_back and index.
 - Remove redundant typedefs of iterators.
 - Comment out unused variable (used only in commented-out GDC code).
 - A few whitespace changes.
This commit is contained in:
Frits van Bommel
2009-03-12 14:08:57 +01:00
parent 723ae9f9d5
commit c1bd2234a9
3 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gen/asm-x86-32.h
View File

@@ -459,12 +459,12 @@ namespace AsmParserx8632
/* Op_FfdR */ { D|rfp, 0, 0 },
/* Op_Ffd_P */ { D|mfp, 0, 0, FP_Types, Clb_ST, Next_Form, Op_FfdR_P }, // pop, fld so also 80 bit, "
/* Op_FfdR_P */ { D|rfp, 0, 0, 0, Clb_ST, Next_Form, Op_FfdRR_P },
/* Op_FfdRR_P */ { D|mfp|rfp,rfp,0, 0, Clb_ST },
/* Op_FfdRR_P */ { D|mfp|rfp,rfp,0, 0, Clb_ST },
/* Op_Fd_P */ { D|mem, 0, 0, 0, Clb_ST }, // "
/* Op_FdST */ { D|rfp, 0, 0 },
/* Op_FMath */ { mfp, 0, 0, FP_Types, Clb_ST, Next_Form, Op_FMath0 }, // and only single or double prec
/* Op_FMath0 */ { 0, 0, 0, 0, Clb_ST, Next_Form, Op_FMath2 },
/* Op_FMath2 */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_FdST0ST1 },
/* Op_FMath0 */ { 0, 0, 0, 0, Clb_ST, Next_Form, Op_FMath2 },
/* Op_FMath2 */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_FdST0ST1 },
/* Op_FdSTiSTi */ { D|rfp, rfp, 0, },
/* Op_FdST0ST1 */ { 0, 0, 0, },
/* Op_FPMath */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_F0_P }, // pops
@@ -1555,17 +1555,17 @@ namespace AsmParserx8632
else
{
insnTemplate->writestring ( ( char* ) fmt );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.dim );
asmcode->args.push ( new AsmArg ( type, e, mode ) );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.size() );
asmcode->args.push_back ( AsmArg ( type, e, mode ) );
}
}
void addOperand2 ( const char * fmtpre, const char * fmtpost, AsmArgType type, Expression * e, AsmCode * asmcode, AsmArgMode mode = Mode_Input )
{
assert ( !sc->func->naked );
insnTemplate->writestring ( ( char* ) fmtpre );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.dim );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.size() );
insnTemplate->writestring ( ( char* ) fmtpost );
asmcode->args.push ( new AsmArg ( type, e, mode ) );
asmcode->args.push_back ( AsmArg ( type, e, mode ) );
}
void addLabel ( char* id )

12
gen/asm-x86-64.h
View File

@@ -533,12 +533,12 @@ namespace AsmParserx8664
/* Op_FfdR */ { D|rfp, 0, 0 },
/* Op_Ffd_P */ { D|mfp, 0, 0, FP_Types, Clb_ST, Next_Form, Op_FfdR_P }, // pop, fld so also 80 bit, "
/* Op_FfdR_P */ { D|rfp, 0, 0, 0, Clb_ST, Next_Form, Op_FfdRR_P },
/* Op_FfdRR_P */ { D|mfp|rfp,rfp,0, 0, Clb_ST },
/* Op_FfdRR_P */ { D|mfp|rfp,rfp,0, 0, Clb_ST },
/* Op_Fd_P */ { D|mem, 0, 0, 0, Clb_ST }, // "
/* Op_FdST */ { D|rfp, 0, 0 },
/* Op_FMath */ { mfp, 0, 0, FP_Types, Clb_ST, Next_Form, Op_FMath0 }, // and only single or double prec
/* Op_FMath0 */ { 0, 0, 0, 0, Clb_ST, Next_Form, Op_FMath2 }, // pops
/* Op_FMath2 */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_FdST0ST1 }, // and only single or double prec
/* Op_FMath2 */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_FdST0ST1 }, // and only single or double prec
/* Op_FdSTiSTi */ { D|rfp, rfp, 0, },
/* Op_FdST0ST1 */ { 0, 0, 0, },
/* Op_FPMath */ { D|rfp, rfp, 0, 0, Clb_ST, Next_Form, Op_F0_P }, // pops
@@ -1677,17 +1677,17 @@ namespace AsmParserx8664
else
{
insnTemplate->writestring ( ( char* ) fmt );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.dim );
asmcode->args.push ( new AsmArg ( type, e, mode ) );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.size() );
asmcode->args.push_back ( AsmArg ( type, e, mode ) );
}
}
void addOperand2 ( const char * fmtpre, const char * fmtpost, AsmArgType type, Expression * e, AsmCode * asmcode, AsmArgMode mode = Mode_Input )
{
assert ( !sc->func->naked );
insnTemplate->writestring ( ( char* ) fmtpre );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.dim );
insnTemplate->printf ( "<<%s%d>>", ( mode==Mode_Input ) ?"in":"out", asmcode->args.size() );
insnTemplate->writestring ( ( char* ) fmtpost );
asmcode->args.push ( new AsmArg ( type, e, mode ) );
asmcode->args.push_back ( AsmArg ( type, e, mode ) );
}
void addLabel ( char* id )

42
gen/asmstmt.cpp
View File

@@ -43,8 +43,8 @@ typedef enum {
} AsmArgMode;
struct AsmArg {
AsmArgType type;
Expression * expr;
AsmArgType type;
AsmArgMode mode;
AsmArg(AsmArgType type, Expression * expr, AsmArgMode mode) {
this->type = type;
@@ -56,7 +56,7 @@ struct AsmArg {
struct AsmCode {
char * insnTemplate;
unsigned insnTemplateLen;
Array args; // of AsmArg
std::vector<AsmArg> args;
std::vector<bool> regs;
unsigned dollarLabel;
int clobbersMemory;
@@ -212,25 +212,24 @@ AsmStatement::toIR(IRState * irs)
static std::string memory_name = "memory";
AsmCode * code = (AsmCode *) asmcode;
std::deque<LLValue*> input_values;
std::deque<std::string> input_constraints;
std::deque<LLValue*> output_values;
std::deque<std::string> output_constraints;
std::deque<std::string> clobbers;
std::vector<LLValue*> input_values;
std::vector<std::string> input_constraints;
std::vector<LLValue*> output_values;
std::vector<std::string> output_constraints;
std::vector<std::string> clobbers;
// FIXME
#define HOST_WIDE_INT long
HOST_WIDE_INT var_frame_offset; // "frame_offset" is a macro
//#define HOST_WIDE_INT long
//HOST_WIDE_INT var_frame_offset; // "frame_offset" is a macro
bool clobbers_mem = code->clobbersMemory;
int input_idx = 0;
int n_outputs = 0;
int arg_map[10];
assert(code->args.dim <= 10);
assert(code->args.size() <= 10);
for (unsigned i = 0; i < code->args.dim; i++) {
AsmArg * arg = (AsmArg *) code->args.data[i];
std::vector<AsmArg>::iterator arg = code->args.begin();
for (unsigned i = 0; i < code->args.size(); i++, ++arg) {
bool is_input = true;
LLValue* arg_val = 0;
std::string cns;
@@ -290,12 +289,10 @@ assert(0);
if (is_input) {
arg_map[i] = --input_idx;
//inputs.cons(tree_cons(NULL_TREE, cns, NULL_TREE), arg_val);
input_values.push_back(arg_val);
input_constraints.push_back(cns);
} else {
arg_map[i] = n_outputs++;
//outputs.cons(tree_cons(NULL_TREE, cns, NULL_TREE), arg_val);
output_values.push_back(arg_val);
output_constraints.push_back(cns);
}
@@ -310,18 +307,16 @@ assert(0);
assert(asmparser);
for (int i = 0; i < code->regs.size(); i++) {
if (code->regs[i]) {
//clobbers.cons(NULL_TREE, regInfo[i].gccName);
clobbers.push_back(asmparser->getRegName(i));
}
}
if (clobbers_mem)
clobbers.push_back(memory_name);
//clobbers.cons(NULL_TREE, memory_name);
// }
// Remap argument numbers
for (unsigned i = 0; i < code->args.dim; i++) {
for (unsigned i = 0; i < code->args.size(); i++) {
if (arg_map[i] < 0)
arg_map[i] = -arg_map[i] - 1 + n_outputs;
}
@@ -345,12 +340,12 @@ assert(0);
++p;
}
typedef std::vector<std::string>::iterator It;
if (Logger::enabled()) {
Logger::println("final asm: %.*s", code->insnTemplateLen, code->insnTemplate);
std::ostringstream ss;
ss << "GCC-style output constraints: {";
typedef std::deque<std::string>::iterator It;
for (It i = output_constraints.begin(), e = output_constraints.end(); i != e; ++i) {
ss << " " << *i;
}
@@ -380,8 +375,7 @@ assert(0);
std::string llvmOutConstraints;
std::string llvmInConstraints;
int n = 0;
typedef std::deque<std::string>::iterator it;
for(it i = output_constraints.begin(), e = output_constraints.end(); i != e; ++i, ++n) {
for(It i = output_constraints.begin(), e = output_constraints.end(); i != e; ++i, ++n) {
// rewrite update constraint to in and out constraints
if((*i)[0] == '+') {
assert(*i == mrw_cns && "What else are we updating except memory?");
@@ -404,19 +398,19 @@ assert(0);
}
asmblock->outputcount += n;
for(it i = input_constraints.begin(), e = input_constraints.end(); i != e; ++i) {
for(It i = input_constraints.begin(), e = input_constraints.end(); i != e; ++i) {
llvmInConstraints += *i;
llvmInConstraints += ",";
}
std::string clobstr;
for(it i = clobbers.begin(), e = clobbers.end(); i != e; ++i) {
for(It i = clobbers.begin(), e = clobbers.end(); i != e; ++i) {
clobstr = "~{" + *i + "},";
asmblock->clobs.insert(clobstr);
}
if (Logger::enabled()) {
typedef std::deque<LLValue*>::iterator It;
typedef std::vector<LLValue*>::iterator It;
{
Logger::println("Output values:");
LOG_SCOPE