Merge commit 'origin/powerpc' into powerpc

Conflicts:
	src/powerpc.cpp
This commit is contained in:
Joel Dice 2009-02-25 18:31:21 -07:00
commit b539d7b1e0

View File

@ -73,6 +73,14 @@ inline int addis(int rt, int ra, int i) { return D(15, rt, ra, i); }
inline int subf(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 40, 0); }
inline int subfc(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 8, 0); }
inline int subfe(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 136, 0); }
inline int mullw(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 235, 0); }
inline int mulhw(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 75, 0); }
inline int mulhwu(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 11, 0); }
inline int mulli(int rt, int ra, int i) { return D(7, rt, ra, i); }
inline int divw(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 491, 0); }
inline int divwu(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 459, 0); }
inline int divd(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 489, 0); }
inline int divdu(int rt, int ra, int rb) { return XO(31, rt, ra, rb, 0, 457, 0); }
inline int and_(int rt, int ra, int rb) { return X(31, ra, rt, rb, 28, 0); }
inline int andi(int rt, int ra, int i) { return D(28, ra, rt, i); }
inline int andis(int rt, int ra, int i) { return D(29, ra, rt, i); }
@ -105,6 +113,7 @@ inline int srwi(int rt, int ra, int i) { return rlwinm(rt, ra, 32-i, i, 31); }
inline int sub(int rt, int ra, int rb) { return subf(rt, rb, ra); }
inline int subc(int rt, int ra, int rb) { return subfc(rt, rb, ra); }
inline int subi(int rt, int ra, int i) { return addi(rt, ra, -i); }
inline int subis(int rt, int ra, int i) { return addis(rt, ra, -i); }
inline int mr(int rt, int ra) { return or_(rt, ra, ra); }
inline int mflr(int rx) { return mfspr(rx, 8); }
inline int mtlr(int rx) { return mtspr(8, rx); }
@ -566,6 +575,15 @@ moveRR(Context* c, unsigned srcSize, Assembler::Register* src,
}
}
void addR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8) {
issue(con, addc(R(t), R(a), R(b)));
issue(con, adde(H(t), H(a), H(b)));
} else {
issue(con, add(R(t), R(a), R(b)));
}
}
void addC(Context* con, unsigned size, Const* a, Reg* b, Reg* t) {
assert(con, size == BytesPerWord);
@ -577,6 +595,84 @@ void addC(Context* con, unsigned size, Const* a, Reg* b, Reg* t) {
}
}
void subR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8) {
issue(con, subfc(R(t), R(a), R(b)));
issue(con, subfe(H(t), H(a), H(b)));
} else {
issue(con, subf(R(t), R(a), R(b)));
}
}
void subC(Context* con, unsigned size, Const* a, Reg* b, Reg* t) {
assert(con, size == BytesPerWord);
int64_t i = getVal(a);
if(i) {
issue(con, subi(R(t), R(b), lo16(i)));
if(not isInt16(i))
issue(con, subis(R(t), R(t), hi16(i)));
}
}
void multiplyR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8) {
if(BytesPerWord == 8) {
// issue(con, mulld(R(t), R(a), R(b)));
abort(con);
} else {
abort(con); // todo
}
} else {
issue(con, mullw(R(t), R(a), R(b)));
}
}
void multiplyC(Context* con, unsigned size, Const* a, Reg* b, Reg* t) {
assert(con, size == BytesPerWord);
int64_t i = getVal(a);
issue(con, mulli(R(t), R(b), i));
}
void divideR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8 && BytesPerWord == 8) {
issue(con, divd(R(t), R(b), R(a)));
} else {
issue(con, divw(R(t), R(b), R(a)));
}
}
void remainderR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
divideR(con, size, a, b, t);
multiplyR(con, size, b, t, t);
subR(con, size, t, a, t);
}
void andC(Context* c, unsigned size, Assembler::Constant* a,
Assembler::Register* b, Assembler::Register* dst)
{
int64_t v = a->value->value();
if(size == 8) {
ResolvedPromise high((v >> 32) & 0xFFFFFFFF);
Assembler::Constant ah(&high);
ResolvedPromise low(v & 0xFFFFFFFF);
Assembler::Constant al(&low);
Assembler::Register bh(b->high);
Assembler::Register dh(dst->high);
andC(c, 4, &al, b, dst);
andC(c, 4, &ah, &bh, &dh);
} else {
issue(c, andi(dst->low, b->low, v));
if (not isInt16(v)) {
issue(c, andis(dst->low, b->low, v >> 16));
}
}
}
int
normalize(Context* c, int offset, int index, unsigned scale,
bool* preserveIndex)
@ -681,75 +777,6 @@ moveRM(Context* c, unsigned srcSize, Assembler::Register* src,
store(c, srcSize, src, dst->base, dst->offset, dst->index, dst->scale, true);
}
void
loadLinkRegisterR(Context* c, unsigned dstSize, Assembler::Register* dst)
{
assert(c, dstSize == BytesPerWord);
issue(c, mflr(dst->low));
}
void
storeLinkRegisterR(Context* c, unsigned srcSize, Assembler::Register* src)
{
assert(c, srcSize == BytesPerWord);
issue(c, mtlr(src->low));
}
void addR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8) {
issue(con, addc(R(t), R(a), R(b)));
issue(con, adde(H(t), H(a), H(b)));
} else {
issue(con, add(R(t), R(a), R(b)));
}
}
void subR(Context* con, unsigned size, Reg* a, Reg* b, Reg* t) {
if(size == 8) {
issue(con, subfc(R(t), R(a), R(b)));
issue(con, subfe(H(t), H(a), H(b)));
} else {
issue(con, subf(R(t), R(a), R(b)));
}
}
void subC(Context* con, unsigned size, Const* a, Reg* b, Reg* t) {
assert(con, size == BytesPerWord);
int64_t i = getVal(a);
if(i) {
issue(con, subi(R(t), R(b), lo16(i)));
issue(con, subi(R(t), R(t), hi16(i)));
}
}
void andC(Context* c, unsigned size, Assembler::Constant* a,
Assembler::Register* b, Assembler::Register* dst)
{
int64_t v = a->value->value();
if(size == 8) {
ResolvedPromise high((v >> 32) & 0xFFFFFFFF);
Assembler::Constant ah(&high);
ResolvedPromise low(v & 0xFFFFFFFF);
Assembler::Constant al(&low);
Assembler::Register bh(b->high);
Assembler::Register dh(dst->high);
andC(c, 4, &al, b, dst);
andC(c, 4, &ah, &bh, &dh);
} else {
issue(c, andi(dst->low, b->low, v));
if (not isInt16(v)) {
issue(c, andis(dst->low, b->low, v >> 16));
}
}
}
void
moveAndUpdateRM(Context* c, unsigned srcSize, Assembler::Register* src,
unsigned dstSize UNUSED, Assembler::Memory* dst)