Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r54326:c2f86113b607
Date: 2012-04-13 07:58 +0000
http://bitbucket.org/pypy/pypy/changeset/c2f86113b607/
Log: de-tab backend
diff --git a/pypy/jit/backend/arm/assembler.py
b/pypy/jit/backend/arm/assembler.py
--- a/pypy/jit/backend/arm/assembler.py
+++ b/pypy/jit/backend/arm/assembler.py
@@ -929,7 +929,7 @@
effectinfo = op.getdescr().get_extra_info()
oopspecindex = effectinfo.oopspecindex
asm_llong_operations[oopspecindex](self, op, arglocs, regalloc, fcond)
- return fcond
+ return fcond
def regalloc_emit_math(self, op, arglocs, fcond, regalloc):
effectinfo = op.getdescr().get_extra_info()
diff --git a/pypy/jit/backend/arm/instruction_builder.py
b/pypy/jit/backend/arm/instruction_builder.py
--- a/pypy/jit/backend/arm/instruction_builder.py
+++ b/pypy/jit/backend/arm/instruction_builder.py
@@ -365,10 +365,10 @@
size = 0x3
n |= size << 20
def f(self, dd, dn, dm):
- N = (dn >> 4) & 0x1
- M = (dm >> 4) & 0x1
- D = (dd >> 4) & 0x1
- Q = 0 # we want doubleword regs
+ N = (dn >> 4) & 0x1
+ M = (dm >> 4) & 0x1
+ D = (dd >> 4) & 0x1
+ Q = 0 # we want doubleword regs
instr = (n
| D << 22
| (dn & 0xf) << 16
@@ -377,7 +377,7 @@
| Q << 6
| M << 5
| (dm & 0xf))
-
+
self.write32(instr)
return f
diff --git a/pypy/jit/backend/arm/opassembler.py
b/pypy/jit/backend/arm/opassembler.py
--- a/pypy/jit/backend/arm/opassembler.py
+++ b/pypy/jit/backend/arm/opassembler.py
@@ -1272,14 +1272,14 @@
assert arg.is_vfp_reg()
assert res.is_reg()
self.mc.VCVT_float_to_int(r.vfp_ip.value, arg.value)
- self.mc.VMOV_rc(res.value, r.ip.value, r.vfp_ip.value)
+ self.mc.VMOV_rc(res.value, r.ip.value, r.vfp_ip.value)
return fcond
def emit_op_cast_int_to_float(self, op, arglocs, regalloc, fcond):
arg, res = arglocs
assert res.is_vfp_reg()
assert arg.is_reg()
- self.mc.MOV_ri(r.ip.value, 0)
+ self.mc.MOV_ri(r.ip.value, 0)
self.mc.VMOV_cr(res.value, arg.value, r.ip.value)
self.mc.VCVT_int_to_float(res.value, res.value)
return fcond
@@ -1301,9 +1301,9 @@
emit_op_convert_float_bytes_to_longlong =
gen_emit_unary_float_op('float_bytes_to_longlong', 'VMOV_cc')
def emit_op_read_timestamp(self, op, arglocs, regalloc, fcond):
- tmp = arglocs[0]
+ tmp = arglocs[0]
res = arglocs[1]
self.mc.MRC(15, 0, tmp.value, 15, 12, 1)
- self.mc.MOV_ri(r.ip.value, 0)
+ self.mc.MOV_ri(r.ip.value, 0)
self.mc.VMOV_cr(res.value, tmp.value, r.ip.value)
return fcond
diff --git a/pypy/jit/backend/arm/regalloc.py b/pypy/jit/backend/arm/regalloc.py
--- a/pypy/jit/backend/arm/regalloc.py
+++ b/pypy/jit/backend/arm/regalloc.py
@@ -378,7 +378,7 @@
return self.assembler.regalloc_emit_llong(op, args, fcond, self)
def perform_math(self, op, args, fcond):
- return self.assembler.regalloc_emit_math(op, args, self, fcond)
+ return self.assembler.regalloc_emit_math(op, args, self, fcond)
def force_spill_var(self, var):
if var.type == FLOAT:
@@ -548,16 +548,16 @@
if effectinfo is not None:
oopspecindex = effectinfo.oopspecindex
if oopspecindex in (EffectInfo.OS_LLONG_ADD,
- EffectInfo.OS_LLONG_SUB,
- EffectInfo.OS_LLONG_AND,
- EffectInfo.OS_LLONG_OR,
- EffectInfo.OS_LLONG_XOR):
+ EffectInfo.OS_LLONG_SUB,
+ EffectInfo.OS_LLONG_AND,
+ EffectInfo.OS_LLONG_OR,
+ EffectInfo.OS_LLONG_XOR):
args = self._prepare_llong_binop_xx(op, fcond)
- self.perform_llong(op, args, fcond)
+ self.perform_llong(op, args, fcond)
return
if oopspecindex == EffectInfo.OS_LLONG_TO_INT:
args = self._prepare_llong_to_int(op, fcond)
- self.perform_llong(op, args, fcond)
+ self.perform_llong(op, args, fcond)
return
if oopspecindex == EffectInfo.OS_MATH_SQRT:
args = self.prepare_op_math_sqrt(op, fcond)
@@ -587,9 +587,9 @@
return self._prepare_call(op)
def _prepare_llong_binop_xx(self, op, fcond):
- # arg 0 is the address of the function
+ # arg 0 is the address of the function
loc0 = self._ensure_value_is_boxed(op.getarg(1))
- loc1 = self._ensure_value_is_boxed(op.getarg(2))
+ loc1 = self._ensure_value_is_boxed(op.getarg(2))
self.possibly_free_vars_for_op(op)
self.free_temp_vars()
res = self.vfprm.force_allocate_reg(op.result)
@@ -1205,7 +1205,7 @@
return []
prepare_op_convert_float_bytes_to_longlong = prepare_float_op(base=False,
- name='prepare_op_convert_float_bytes_to_longlong')
+
name='prepare_op_convert_float_bytes_to_longlong')
def prepare_op_read_timestamp(self, op, fcond):
loc = self.get_scratch_reg(INT)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
