From cbed2c46f48ace0d625f60b03d603310e84bbbe1 Mon Sep 17 00:00:00 2001 From: Julian Hammer Date: Fri, 13 Dec 2019 17:38:07 +0100 Subject: [PATCH] allowing for comment in marker; dev version bump --- osaca/__init__.py | 2 +- osaca/semantics/marker_utils.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/osaca/__init__.py b/osaca/__init__.py index 4c69279..07d2225 100644 --- a/osaca/__init__.py +++ b/osaca/__init__.py @@ -1,6 +1,6 @@ """Open Source Architecture Code Analyzer""" name = 'osaca' -__version__ = '0.3.1' +__version__ = '0.3.2.dev1' # To trigger travis deployment to pypi, do the following: # 1. Increment __version___ diff --git a/osaca/semantics/marker_utils.py b/osaca/semantics/marker_utils.py index 77d0eb1..5b212a9 100755 --- a/osaca/semantics/marker_utils.py +++ b/osaca/semantics/marker_utils.py @@ -33,7 +33,7 @@ def find_marked_kernel_x86ATT(lines): ) -def get_marker(isa): +def get_marker(isa, comment=""): """Return tuple of start and end marker lines.""" if isa == 'x86': start_marker_raw = ( @@ -42,6 +42,8 @@ def get_marker(isa): '.byte 103 # OSACA START MARKER\n' '.byte 144 # OSACA START MARKER\n' ) + if comment: + start_marker_raw += "# {}\m".format(comment) end_marker_raw = ( 'movl $222, %ebx # OSACA END MARKER\n' '.byte 100 # OSACA END MARKER\n' @@ -53,6 +55,8 @@ def get_marker(isa): 'mov x1, #111 // OSACA START MARKER\n' '.byte 213,3,32,31 // OSACA START MARKER\n' ) + if comment: + start_marker_raw += "// {}\n".format(comment) # After loop end_marker_raw = ( 'mov x1, #222 // OSACA END MARKER\n'