From: "Rebecca Cran" <rebecca@bsdio.com>
To: Andrew Fish <afish@apple.com>,
edk2-devel-groups-io <devel@edk2.groups.io>
Cc: Ray Ni <ray.ni@intel.com>,
"Kinney, Michael D" <michael.d.kinney@intel.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
leif@nuviainc.com
Subject: Re: [edk2-devel] [PATCH] EmulatorPkg: Update lldbefi.py to work with current lldb which uses python3
Date: Wed, 1 Dec 2021 19:42:23 -0700 [thread overview]
Message-ID: <105601cb-f815-4a5e-c786-c065f737953b@bsdio.com> (raw)
In-Reply-To: <37EF0F13-4C27-4D4F-93D1-FEF6CB0DF8C2@apple.com>
I just noticed this was never committed.
Could someone commit/push this change please?
--
Rebecca Cran
On 7/20/21 23:25, Andrew Fish wrote:
> Reviewed-by: Andrew Fish <afish@apple.com>
>
>> On May 9, 2021, at 12:26 PM, Rebecca Cran <rebecca@bsdio.com> wrote:
>>
>> The version of lldb shipping with macOS Big Sur is lldb-1205.0.27.3, and
>> it uses python3. Update lldbefi.py to work with it, including removing
>> the unused 'commands' import and fixing the print statements.
>>
>> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
>> ---
>> EmulatorPkg/Unix/lldbefi.py | 17 ++++++++---------
>> 1 file changed, 8 insertions(+), 9 deletions(-)
>>
>> diff --git a/EmulatorPkg/Unix/lldbefi.py b/EmulatorPkg/Unix/lldbefi.py
>> index c3fb2675cb..952f8bf982 100755
>> --- a/EmulatorPkg/Unix/lldbefi.py
>> +++ b/EmulatorPkg/Unix/lldbefi.py
>> @@ -10,7 +10,6 @@ import lldb
>> import os
>> import uuid
>> import string
>> -import commands
>> import optparse
>> import shlex
>>
>> @@ -389,7 +388,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_dict):
>>
>> FileName = frame.thread.process.ReadCStringFromMemory (FileNamePtr, FileNameLen, Error)
>> if not Error.Success():
>> - print "!ReadCStringFromMemory() did not find a %d byte C string at %x" % (FileNameLen, FileNamePtr)
>> + print("!ReadCStringFromMemory() did not find a %d byte C string at %x" % (FileNameLen, FileNamePtr))
>> # make breakpoint command continue
>> return False
>>
>> @@ -398,7 +397,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_dict):
>> LoadAddress = frame.FindVariable ("LoadAddress").GetValueAsUnsigned() - 0x240
>>
>> debugger.HandleCommand ("target modules add %s" % FileName)
>> - print "target modules load --slid 0x%x %s" % (LoadAddress, FileName)
>> + print("target modules load --slid 0x%x %s" % (LoadAddress, FileName))
>> debugger.HandleCommand ("target modules load --slide 0x%x --file %s" % (LoadAddress, FileName))
>> else:
>> target = debugger.GetSelectedTarget()
>> @@ -408,7 +407,7 @@ def LoadEmulatorEfiSymbols(frame, bp_loc , internal_dict):
>> if FileName == ModuleName or FileName == SBModule.GetFileSpec().GetFilename():
>> target.ClearModuleLoadAddress (SBModule)
>> if not target.RemoveModule (SBModule):
>> - print "!lldb.target.RemoveModule (%s) FAILED" % SBModule
>> + print("!lldb.target.RemoveModule (%s) FAILED" % SBModule)
>>
>> # make breakpoint command continue
>> return False
>> @@ -490,15 +489,15 @@ def efi_guid_command(debugger, command, result, dict):
>>
>> if len(args) >= 1:
>> if GuidStr in guid_dict:
>> - print "%s = %s" % (guid_dict[GuidStr], GuidStr)
>> - print "%s = %s" % (guid_dict[GuidStr], GuidToCStructStr (GuidStr))
>> + print("%s = %s" % (guid_dict[GuidStr], GuidStr))
>> + print("%s = %s" % (guid_dict[GuidStr], GuidToCStructStr (GuidStr)))
>> else:
>> - print GuidStr
>> + print(GuidStr)
>> else:
>> # dump entire dictionary
>> width = max(len(v) for k,v in guid_dict.iteritems())
>> for value in sorted(guid_dict, key=guid_dict.get):
>> - print '%-*s %s %s' % (width, guid_dict[value], value, GuidToCStructStr(value))
>> + print('%-*s %s %s' % (width, guid_dict[value], value, GuidToCStructStr(value)))
>>
>> return
>>
>> @@ -538,4 +537,4 @@ def __lldb_init_module (debugger, internal_dict):
>> if Breakpoint.GetNumLocations() == 1:
>> # Set the emulator breakpoints, if we are in the emulator
>> debugger.HandleCommand("breakpoint command add -s python -F lldbefi.LoadEmulatorEfiSymbols {id}".format(id=Breakpoint.GetID()))
>> - print 'Type r to run emulator. SecLldbScriptBreak armed. EFI modules should now get source level debugging in the emulator.'
>> + print('Type r to run emulator. SecLldbScriptBreak armed. EFI modules should now get source level debugging in the emulator.')
>> --
>> 2.30.1 (Apple Git-130)
>>
>>
>>
>>
>>
>>
>>
next prev parent reply other threads:[~2021-12-02 2:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-09 19:26 [PATCH] EmulatorPkg: Update lldbefi.py to work with current lldb which uses python3 Rebecca Cran
2021-07-21 5:25 ` [edk2-devel] " Andrew Fish
2021-12-02 2:42 ` Rebecca Cran [this message]
2021-12-13 15:28 ` Ard Biesheuvel
[not found] <167D7C94C5E426A6.21893@groups.io>
2021-05-17 13:28 ` Rebecca Cran
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=105601cb-f815-4a5e-c786-c065f737953b@bsdio.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox