From c5ce661299d2fa0b67130db3a4ad8af29f8b1c48 Mon Sep 17 00:00:00 2001 From: x0r Date: Fri, 8 Mar 2024 23:44:54 +0100 Subject: [PATCH] latest --- pyproject.toml | 3 +++ tests/test_tasm_cpp.py | 53 --------------------------------------- tests/test_tasm_parser.py | 18 ------------- 3 files changed, 3 insertions(+), 71 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 159383d..f2d4f40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,3 +36,6 @@ tag-date = 0 [project.scripts] masm2c = "masm2c.cli:main" + +[tool.setuptools] +packages = ["masm2c"] diff --git a/tests/test_tasm_cpp.py b/tests/test_tasm_cpp.py index 55fc92f..ba89409 100644 --- a/tests/test_tasm_cpp.py +++ b/tests/test_tasm_cpp.py @@ -1110,21 +1110,6 @@ def test_args_23770(self): def test_args_23780(self): assert self.parser.parse_arg('ebp', def_size=4, destination=False) == 'ebp' - def test_args_23790(self): - assert self.parser.parse_arg('ebp', def_size=4, destination=True) == 'ebp' - - def test_args_23800(self): - assert self.parser.parse_arg('ebx', def_size=0, destination=False) == 'ebx' - - def test_args_23810(self): - assert self.parser.parse_arg('ebx', def_size=4, destination=False) == 'ebx' - - def test_args_23820(self): - assert self.parser.parse_arg('ebx', def_size=4, destination=True) == 'ebx' - - def test_args_23830(self): - assert self.parser.parse_arg('ecx', def_size=0, destination=False) == 'ecx' - def test_args_23840(self): assert self.parser.parse_arg('ecx', def_size=4, destination=False) == 'ecx' @@ -1644,11 +1629,6 @@ def test_args_25560(self): def test_args_25570(self): self.assertEqual(self.cpp.expand(expr=self.parser.parse_arg(u'byte ptr es:[0]'),def_size=1,destination=True),u'*(raddr(es,0))') """ - def test_args_25580(self): - assert self.parser.parse_arg('ds:[eax*2]', def_size=0, destination=False) == '*(raddr(ds,eax*2))' - - def test_args_25590(self): - assert self.parser.parse_arg('ds:[ebx*4]', def_size=0, destination=False) == '*(raddr(ds,ebx*4))' def test_args_25600(self): assert self.parser.parse_arg('ds:[ecx*8]', def_size=0, destination=False) == '*(raddr(ds,ecx*8))' @@ -4125,15 +4105,6 @@ def test_cpp_33870(self): def test_cpp_33880(self): assert self.cpp.convert_asm_number_into_c(expr='26') == '26' - def test_cpp_33890(self): - assert self.cpp.convert_asm_number_into_c(expr='27') == '27' - - def test_cpp_33900(self): - assert self.cpp.convert_asm_number_into_c(expr='28') == '28' - - def test_cpp_33910(self): - assert self.cpp.convert_asm_number_into_c(expr='29') == '29' - def test_cpp_33920(self): assert self.cpp.convert_asm_number_into_c(expr='2Ch') == '0x2C' @@ -5122,30 +5093,6 @@ def test_cpp_37180(self): def test_cpp_37190(self): assert self.cpp.convert_asm_number_into_c(expr='offset aBtrl') == 'offset aBtrl' - def test_cpp_37200(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aBtrw') == 'offset aBtrw' - - def test_cpp_37210(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aBtsl') == 'offset aBtsl' - - def test_cpp_37220(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aBtsw') == 'offset aBtsw' - - def test_cpp_37230(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aBtw') == 'offset aBtw' - - def test_cpp_37240(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aCbw') == 'offset aCbw' - - def test_cpp_37250(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aCdq') == 'offset aCdq' - - def test_cpp_37260(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aCmpb') == 'offset aCmpb' - - def test_cpp_37270(self): - assert self.cpp.convert_asm_number_into_c(expr='offset aCmpl') == 'offset aCmpl' - def test_cpp_37280(self): assert self.cpp.convert_asm_number_into_c(expr='offset aCmpsb') == 'offset aCmpsb' diff --git a/tests/test_tasm_parser.py b/tests/test_tasm_parser.py index 4bf201f..ca94d5e 100644 --- a/tests/test_tasm_parser.py +++ b/tests/test_tasm_parser.py @@ -1826,9 +1826,6 @@ def test_instr_6180(self): def test_instr_6190(self): self.assertEqual(*self.doTest('mov dword ptr [esp+0Ch], 1 ; iflags', 'MOV(*(dd*)(raddr(ss,esp+0x0C)), 1)')) - def test_instr_6200(self): - self.assertEqual(*self.doTest('mov dword ptr [esp+0Ch], 1000h', 'MOV(*(dd*)(raddr(ss,esp+0x0C)), 0x1000)')) - def test_instr_6210(self): self.assertEqual(*self.doTest('mov dword ptr [esp+0Ch], 1234h', 'MOV(*(dd*)(raddr(ss,esp+0x0C)), 0x1234)')) @@ -1853,9 +1850,6 @@ def test_instr_6270(self): def test_instr_6280(self): self.assertEqual(*self.doTest('mov dword ptr [esp+10h], 11h', 'MOV(*(dd*)(raddr(ss,esp+0x10)), 0x11)')) - def test_instr_6290(self): - self.assertEqual(*self.doTest('mov dword ptr [esp+14h], 0', 'MOV(*(dd*)(raddr(ss,esp+0x14)), 0)')) - def test_instr_6300(self): self.assertEqual(*self.doTest('mov dword ptr [esp+1Ch], 0', 'MOV(*(dd*)(raddr(ss,esp+0x1C)), 0)')) @@ -2366,15 +2360,6 @@ def test_instr_8000(self): def test_instr_8010(self): self.assertEqual(*self.doTest('mov eax, ebx', 'eax = ebx;')) - def test_instr_8020(self): - self.assertEqual(*self.doTest('mov eax, edi', 'eax = edi;')) - - def test_instr_8030(self): - self.assertEqual(*self.doTest('mov eax, edx', 'eax = edx;')) - - def test_instr_8040(self): - self.assertEqual(*self.doTest('mov eax, esi', 'eax = esi;')) - def test_instr_8050(self): self.assertEqual(*self.doTest('mov eax, flags', 'eax = flags;')) @@ -2600,9 +2585,6 @@ def test_instr_8780(self): def test_instr_8790(self): self.assertEqual(*self.doTest('and edx, ecx', 'AND(edx, ecx)')) - def test_instr_8800(self): - self.assertEqual(*self.doTest('mov ax,bp', 'ax = bp;')) - def test_instr_8810(self): self.assertEqual(*self.doTest('mov bl,-1', 'bl = -1;'))