[SeaBIOS] [PATCH v1] Reformat .lst in case it is generated by latest iasl.

Kevin O'Connor kevin at koconnor.net
Mon Feb 11 03:11:14 CET 2013


On Wed, Feb 06, 2013 at 11:23:26PM -0500, Kevin O'Connor wrote:
> On Mon, Feb 04, 2013 at 02:06:23PM +0800, Bo Yang wrote:
> > Latest iasl generate .lst as 'number:  ' instead of 'number....', then
> > acpi_extrace.py fails to extract any useful information, building
> > fails.
[...]
> Is there any reason we couldn't just change the original regex to:
> ^([0-9A-Fa-f]+)(:\s\s|\.\.\.\.)\s*

I updated the tool to use the above regex format (see patch below).
It's in my local tree, and I will push it in the next few days.

Thanks.
-Kevin


commit 22db91c1e50bfd671a01c0b5975b23113853b768
Author: Kevin O'Connor <kevin at koconnor.net>
Date:   Sun Feb 10 21:06:14 2013 -0500

    Update tools/acpi_extract.py to handle iasl 20130117 release.
    
    The latest iasl release produces "lst" output with "number:  " instead
    of "number....".  Update the tool to support both formats.
    
    Reported-by: Bo Yang <boyang at suse.com>
    Signed-off-by: Kevin O'Connor <kevin at koconnor.net>

diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py
index 3295678..dd3ccfd 100755
--- a/tools/acpi_extract.py
+++ b/tools/acpi_extract.py
@@ -225,12 +225,12 @@ for line in fileinput.input():
     lineno = lineno + 1
     debug = "input line %d: %s" % (lineno, line)
     #ASL listing: space, then line#, then ...., then code
-    pasl = re.compile('^\s+([0-9]+)\.\.\.\.\s*')
+    pasl = re.compile('^\s+([0-9]+)(:\s\s|\.\.\.\.)\s*')
     m = pasl.search(line)
     if (m):
         add_asl(lineno, pasl.sub("", line));
     # AML listing: offset in hex, then ...., then code
-    paml = re.compile('^([0-9A-Fa-f]+)\.\.\.\.\s*')
+    paml = re.compile('^([0-9A-Fa-f]+)(:\s\s|\.\.\.\.)\s*')
     m = paml.search(line)
     if (m):
         add_aml(m.group(1), paml.sub("", line))



More information about the SeaBIOS mailing list