Remove mips.
We aren't going to support riscv32, so we won't even need to reuse any of this. Test: treehugger Change-Id: I80d6285ecbd0dfdeeb496be39ba63e06cbb30acd
This commit is contained in:
@@ -84,32 +84,6 @@ backtrace:
|
|||||||
#07 pc 0000000000014e90 /system/lib64/libc.so (__start_thread+16)
|
#07 pc 0000000000014e90 /system/lib64/libc.so (__start_thread+16)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
mips = """
|
|
||||||
Build fingerprint: 'Android/aosp_mips/generic_mips:4.4.3.43.43.43/AOSP/enh06302258:eng/test-keys'
|
|
||||||
Revision: '0'
|
|
||||||
ABI: 'mips'
|
|
||||||
pid: 958, tid: 960, name: crasher >>> crasher <<<
|
|
||||||
signal 6 (SIGABRT), code -6 (SI_TKILL), fault addr --------
|
|
||||||
zr 00000000 at 802babc0 v0 00000000 v1 77b99dd0
|
|
||||||
a0 000003be a1 000003c0 a2 00000006 a3 00000000
|
|
||||||
t0 00000000 t1 9e7f5440 t2 00000020 t3 ffffff18
|
|
||||||
t4 77a9c000 t5 00000001 t6 00000000 t7 00000000
|
|
||||||
s0 000003c0 s1 77b99dd8 s2 00000000 s3 00000006
|
|
||||||
s4 77db2028 s5 000003be s6 77c39fa8 s7 77b99dd0
|
|
||||||
t8 00000000 t9 77c89e80 k0 00000000 k1 00000000
|
|
||||||
gp 77cce350 sp 77b99c78 s8 77db2020 ra 77c3b48c
|
|
||||||
hi 00000000 lo 00000008 bva 7fff7008 epc 77c89e94
|
|
||||||
|
|
||||||
backtrace:
|
|
||||||
#00 pc 00067e94 /system/lib/libc.so (tgkill+20)
|
|
||||||
#01 pc 0001948c /system/lib/libc.so (pthread_kill+244)
|
|
||||||
#02 pc 0001b0e8 /system/lib/libc.so (raise+60)
|
|
||||||
#03 pc 00012908 /system/lib/libc.so (abort+104)
|
|
||||||
#04 pc 000012a4 /system/xbin/crasher
|
|
||||||
#05 pc 00018008 /system/lib/libc.so (__pthread_start(void*)+96)
|
|
||||||
#06 pc 00013198 /system/lib/libc.so (__start_thread+36)
|
|
||||||
"""
|
|
||||||
|
|
||||||
x86 = """
|
x86 = """
|
||||||
Build fingerprint: 'Android/aosp_x86_64/generic_x86_64:4.4.3.43.43.43/AOSP/enh06302258:eng/test-keys'
|
Build fingerprint: 'Android/aosp_x86_64/generic_x86_64:4.4.3.43.43.43/AOSP/enh06302258:eng/test-keys'
|
||||||
Revision: '0'
|
Revision: '0'
|
||||||
|
|||||||
@@ -65,7 +65,6 @@ class TraceConverter:
|
|||||||
register_names = {
|
register_names = {
|
||||||
"arm": "r0|r1|r2|r3|r4|r5|r6|r7|r8|r9|sl|fp|ip|sp|lr|pc|cpsr",
|
"arm": "r0|r1|r2|r3|r4|r5|r6|r7|r8|r9|sl|fp|ip|sp|lr|pc|cpsr",
|
||||||
"arm64": "x0|x1|x2|x3|x4|x5|x6|x7|x8|x9|x10|x11|x12|x13|x14|x15|x16|x17|x18|x19|x20|x21|x22|x23|x24|x25|x26|x27|x28|x29|x30|sp|pc|pstate",
|
"arm64": "x0|x1|x2|x3|x4|x5|x6|x7|x8|x9|x10|x11|x12|x13|x14|x15|x16|x17|x18|x19|x20|x21|x22|x23|x24|x25|x26|x27|x28|x29|x30|sp|pc|pstate",
|
||||||
"mips": "zr|at|v0|v1|a0|a1|a2|a3|t0|t1|t2|t3|t4|t5|t6|t7|s0|s1|s2|s3|s4|s5|s6|s7|t8|t9|k0|k1|gp|sp|s8|ra|hi|lo|bva|epc",
|
|
||||||
"x86": "eax|ebx|ecx|edx|esi|edi|x?cs|x?ds|x?es|x?fs|x?ss|eip|ebp|esp|flags",
|
"x86": "eax|ebx|ecx|edx|esi|edi|x?cs|x?ds|x?es|x?fs|x?ss|eip|ebp|esp|flags",
|
||||||
"x86_64": "rax|rbx|rcx|rdx|rsi|rdi|r8|r9|r10|r11|r12|r13|r14|r15|cs|ss|rip|rbp|rsp|eflags",
|
"x86_64": "rax|rbx|rcx|rdx|rsi|rdi|r8|r9|r10|r11|r12|r13|r14|r15|cs|ss|rip|rbp|rsp|eflags",
|
||||||
"riscv64": "ra|sp|gp|tp|t0|t1|t2|s0|s1|a0|a1|a2|a3|a4|a5|a6|a7|s2|s3|s4|s5|s6|s7|s8|s9|s10|s11|t3|t4|t5|t6|pc",
|
"riscv64": "ra|sp|gp|tp|t0|t1|t2|s0|s1|a0|a1|a2|a3|a4|a5|a6|a7|s2|s3|s4|s5|s6|s7|s8|s9|s10|s11|t3|t4|t5|t6|pc",
|
||||||
@@ -599,9 +598,6 @@ class RegisterPatternTests(unittest.TestCase):
|
|||||||
def test_arm64_registers(self):
|
def test_arm64_registers(self):
|
||||||
self.assert_register_matches("arm64", example_crashes.arm64, '\\b(x0|x4|x8|x12|x16|x20|x24|x28|sp)\\b')
|
self.assert_register_matches("arm64", example_crashes.arm64, '\\b(x0|x4|x8|x12|x16|x20|x24|x28|sp)\\b')
|
||||||
|
|
||||||
def test_mips_registers(self):
|
|
||||||
self.assert_register_matches("mips", example_crashes.mips, '\\b(zr|a0|t0|t4|s0|s4|t8|gp|hi)\\b')
|
|
||||||
|
|
||||||
def test_x86_registers(self):
|
def test_x86_registers(self):
|
||||||
self.assert_register_matches("x86", example_crashes.x86, '\\b(eax|esi|xcs|eip)\\b')
|
self.assert_register_matches("x86", example_crashes.x86, '\\b(eax|esi|xcs|eip)\\b')
|
||||||
|
|
||||||
|
|||||||
@@ -522,7 +522,7 @@ def GetAbiFromToolchain(toolchain_var, bits):
|
|||||||
if not toolchain:
|
if not toolchain:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
toolchain_match = re.search("\/(aarch64|arm|mips|x86)\/", toolchain)
|
toolchain_match = re.search("\/(aarch64|arm|x86)\/", toolchain)
|
||||||
if toolchain_match:
|
if toolchain_match:
|
||||||
abi = toolchain_match.group(1)
|
abi = toolchain_match.group(1)
|
||||||
if abi == "aarch64":
|
if abi == "aarch64":
|
||||||
@@ -530,8 +530,6 @@ def GetAbiFromToolchain(toolchain_var, bits):
|
|||||||
elif bits == 64:
|
elif bits == 64:
|
||||||
if abi == "x86":
|
if abi == "x86":
|
||||||
return "x86_64"
|
return "x86_64"
|
||||||
elif abi == "mips":
|
|
||||||
return "mips64"
|
|
||||||
return abi
|
return abi
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -600,7 +598,6 @@ class FindToolchainTests(unittest.TestCase):
|
|||||||
def test_toolchains_found(self):
|
def test_toolchains_found(self):
|
||||||
self.assert_toolchain_found("arm")
|
self.assert_toolchain_found("arm")
|
||||||
self.assert_toolchain_found("arm64")
|
self.assert_toolchain_found("arm64")
|
||||||
self.assert_toolchain_found("mips")
|
|
||||||
self.assert_toolchain_found("x86")
|
self.assert_toolchain_found("x86")
|
||||||
self.assert_toolchain_found("x86_64")
|
self.assert_toolchain_found("x86_64")
|
||||||
|
|
||||||
@@ -618,11 +615,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["ABI: 'arm64'"])
|
SetAbi(["ABI: 'arm64'"])
|
||||||
self.assertEqual(ARCH, "arm64")
|
self.assertEqual(ARCH, "arm64")
|
||||||
|
|
||||||
SetAbi(["ABI: 'mips'"])
|
|
||||||
self.assertEqual(ARCH, "mips")
|
|
||||||
SetAbi(["ABI: 'mips64'"])
|
|
||||||
self.assertEqual(ARCH, "mips64")
|
|
||||||
|
|
||||||
SetAbi(["ABI: 'x86'"])
|
SetAbi(["ABI: 'x86'"])
|
||||||
self.assertEqual(ARCH, "x86")
|
self.assertEqual(ARCH, "x86")
|
||||||
SetAbi(["ABI: 'x86_64'"])
|
SetAbi(["ABI: 'x86_64'"])
|
||||||
@@ -636,11 +628,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#00 pc 000374e0"])
|
SetAbi(["#00 pc 000374e0"])
|
||||||
self.assertEqual(ARCH, "arm")
|
self.assertEqual(ARCH, "arm")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#00 pc 000374e0"])
|
|
||||||
self.assertEqual(ARCH, "mips")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||||
SetAbi(["#00 pc 000374e0"])
|
SetAbi(["#00 pc 000374e0"])
|
||||||
@@ -655,12 +642,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#00 pc 000374e0"])
|
SetAbi(["#00 pc 000374e0"])
|
||||||
self.assertEqual(ARCH, "arm")
|
self.assertEqual(ARCH, "arm")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#00 pc 000374e0"])
|
|
||||||
self.assertEqual(ARCH, "mips")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||||
@@ -675,11 +656,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#00 pc 00000000000374e0"])
|
SetAbi(["#00 pc 00000000000374e0"])
|
||||||
self.assertEqual(ARCH, "arm64")
|
self.assertEqual(ARCH, "arm64")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#00 pc 00000000000374e0"])
|
|
||||||
self.assertEqual(ARCH, "mips64")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||||
SetAbi(["#00 pc 00000000000374e0"])
|
SetAbi(["#00 pc 00000000000374e0"])
|
||||||
@@ -702,11 +678,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
||||||
self.assertEqual(ARCH, "arm")
|
self.assertEqual(ARCH, "arm")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
|
||||||
self.assertEqual(ARCH, "mips")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
||||||
@@ -721,12 +692,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#3 0xae1725b5 (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
|
SetAbi(["#3 0xae1725b5 (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
|
||||||
self.assertEqual(ARCH, "arm")
|
self.assertEqual(ARCH, "arm")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#3 0xae1725b5 (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
|
|
||||||
self.assertEqual(ARCH, "mips")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||||
@@ -741,11 +706,6 @@ class SetArchTests(unittest.TestCase):
|
|||||||
SetAbi(["#0 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
SetAbi(["#0 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
||||||
self.assertEqual(ARCH, "arm64")
|
self.assertEqual(ARCH, "arm64")
|
||||||
|
|
||||||
os.environ.clear()
|
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
|
||||||
SetAbi(["#1 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
|
||||||
self.assertEqual(ARCH, "mips64")
|
|
||||||
|
|
||||||
os.environ.clear()
|
os.environ.clear()
|
||||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||||
SetAbi(["#12 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
SetAbi(["#12 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
||||||
|
|||||||
Reference in New Issue
Block a user