Author: David Schneider <[email protected]>
Branch: arm-backend-2
Changeset: r51438:d0ed9d2beb0e
Date: 2012-01-18 12:14 +0100
http://bitbucket.org/pypy/pypy/changeset/d0ed9d2beb0e/
Log: kill unused code
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
@@ -1,12 +1,10 @@
from __future__ import with_statement
import os
-from pypy.jit.backend.arm.helper.assembler import saved_registers, \
- decode32, encode32, \
- decode64
+from pypy.jit.backend.arm.helper.assembler import saved_registers
from pypy.jit.backend.arm import conditions as c
from pypy.jit.backend.arm import registers as r
from pypy.jit.backend.arm.arch import WORD, DOUBLE_WORD, FUNC_ALIGN, \
- PC_OFFSET, N_REGISTERS_SAVED_BY_MALLOC
+ N_REGISTERS_SAVED_BY_MALLOC
from pypy.jit.backend.arm.codebuilder import ARMv7Builder, OverwritingBuilder
from pypy.jit.backend.arm.regalloc import (Regalloc, ARMFrameManager,
ARMv7RegisterManager, check_imm_arg,
diff --git a/pypy/jit/backend/arm/helper/assembler.py
b/pypy/jit/backend/arm/helper/assembler.py
--- a/pypy/jit/backend/arm/helper/assembler.py
+++ b/pypy/jit/backend/arm/helper/assembler.py
@@ -195,25 +195,3 @@
reg_args = x
break
return reg_args
-
-def decode32(mem, index):
- return intmask(ord(mem[index])
- | ord(mem[index+1]) << 8
- | ord(mem[index+2]) << 16
- | ord(mem[index+3]) << 24)
-
-def decode64(mem, index):
- low = decode32(mem, index)
- index += 4
- high = decode32(mem, index)
- return (r_longlong(high) << 32) | r_longlong(r_uint(low))
-
-def encode32(mem, i, n):
- mem[i] = chr(n & 0xFF)
- mem[i+1] = chr((n >> 8) & 0xFF)
- mem[i+2] = chr((n >> 16) & 0xFF)
- mem[i+3] = chr((n >> 24) & 0xFF)
-
-def encode64(mem, i, n):
- for x in range(8):
- mem[i+x] = chr((n >> (x*8)) & 0xFF)
diff --git a/pypy/jit/backend/arm/test/test_helper.py
b/pypy/jit/backend/arm/test/test_helper.py
--- a/pypy/jit/backend/arm/test/test_helper.py
+++ b/pypy/jit/backend/arm/test/test_helper.py
@@ -6,6 +6,7 @@
from pypy.jit.backend.arm.test.support import skip_unless_arm
skip_unless_arm()
+
def test_count_reg_args():
assert count_reg_args([BoxPtr()]) == 1
assert count_reg_args([BoxPtr()] * 2) == 2
@@ -21,26 +22,3 @@
assert count_reg_args([BoxInt(), BoxFloat(), BoxInt()]) == 2
assert count_reg_args([BoxInt(), BoxInt(), BoxInt(), BoxFloat()]) == 3
-
-def test_encode32():
- mem = [None]*4
- encode32(mem, 0, 1234567)
- assert ''.join(mem) == '\x87\xd6\x12\x00'
- mem = [None]*4
- encode32(mem, 0, 983040)
- assert ''.join(mem) == '\x00\x00\x0F\x00'
-
-def test_decode32():
- mem = list('\x87\xd6\x12\x00')
- assert decode32(mem, 0) == 1234567
- mem = list('\x00\x00\x0F\x00')
- assert decode32(mem, 0) == 983040
-
-def test_decode64():
- mem = list('\x87\xd6\x12\x00\x00\x00\x0F\x00')
- assert decode64(mem, 0) == 4222124651894407L
-
-def test_encode64():
- mem = [None] * 8
- encode64(mem, 0, 4222124651894407L)
- assert ''.join(mem) == '\x87\xd6\x12\x00\x00\x00\x0F\x00'
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
