Lerking/OSACA
1
0
Fork 0
mirror of https://github.com/RRZE-HPC/OSACA.git synced 2026-01-08 04:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #88

Browse Source
This commit is contained in:
JanLJL
2022-06-22 17:09:24 +02:00
parent 04b74327ef
commit e4df8893dd
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osaca/semantics/marker_utils.py
View File

@@ -35,7 +35,7 @@ def find_marked_kernel_AArch64(lines):
:param list lines: kernel
:returns: `tuple of int` -- start and end line of marked section
"""
nop_bytes = ["213", "3", "32", "31"]
nop_bytes = [213, 3, 32, 31]
return find_marked_section(
lines,
ParserAArch64(),
@@ -55,7 +55,7 @@ def find_marked_kernel_x86ATT(lines):
:param list lines: kernel
:returns: `tuple of int` -- start and end line of marked section
"""
nop_bytes = ["100", "103", "144"]
nop_bytes = [100, 103, 144]
return find_marked_section(
lines,
ParserX86ATT(),
@@ -186,7 +186,7 @@ def match_bytes(lines, index, byte_list):
and lines[index].directive.name == "byte"
):
line_count += 1
extracted_bytes += lines[index].directive.parameters
extracted_bytes += [int(x, 0) for x in lines[index].directive.parameters]
index += 1
if extracted_bytes[0 : len(byte_list)] == byte_list:
return True, line_count

8
tests/test_marker_utils.py
View File

@@ -53,6 +53,8 @@ class TestMarkerUtils(unittest.TestCase):
bytes_3_lines_2 = ".byte 213\n" + ".byte 3,32\n" + ".byte 31\n"
bytes_3_lines_3 = ".byte 213\n" + ".byte 3\n" + ".byte 32,31\n"
bytes_4_lines = ".byte 213\n" + ".byte 3\n" + ".byte 32\n" + ".byte 31\n"
bytes_hex = ".byte 0xd5, 0x3, 0x20, 0x1f\n"
bytes_mixed = ".byte 0xd5\n.byte 3,0x20\n.byte 31\n"
mov_start_1 = "mov x1, #111\n"
mov_start_2 = "mov x1, 111 // should work as well\n"
mov_end_1 = "mov x1, #222 // preferred way\n"
@@ -80,6 +82,8 @@ class TestMarkerUtils(unittest.TestCase):
bytes_3_lines_2,
bytes_3_lines_3,
bytes_4_lines,
bytes_hex,
bytes_mixed
]
mov_start_variations = [mov_start_1, mov_start_2]
mov_end_variations = [mov_end_1, mov_end_2]
@@ -129,6 +133,8 @@ class TestMarkerUtils(unittest.TestCase):
+ ".byte 103 # IACA MARKER UTILITY\n"
+ ".byte 144 # IACA MARKER UTILITY\n"
)
bytes_hex_line = ".byte 0x64,0x67,0x90\n"
bytes_mixed = ".byte 0x64 # MARKER\n .byte 103,0x90 # ANOTHER MARKER\n"
mov_start_1 = "movl $111, %ebx # IACA START\n"
mov_start_2 = "mov $111, %ebx # IACA START\n"
mov_end_1 = "movl $222, %ebx # IACA END\n"
@@ -148,6 +154,8 @@ class TestMarkerUtils(unittest.TestCase):
bytes_2_lines_1,
bytes_2_lines_2,
bytes_3_lines,
bytes_hex_line,
bytes_mixed
]
mov_start_variations = [mov_start_1, mov_start_2]
mov_end_variations = [mov_end_1, mov_end_2]