diff options
| author | Peter Jones <pjones@redhat.com> | 2015-06-30 13:24:56 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2015-06-30 14:19:57 -0400 |
| commit | 70ce2c420484ef964b6443c102bfd78c29965e10 (patch) | |
| tree | b06581a9d6522e8f442c03f93eb6fae6aef1b786 /shim.c | |
| parent | 60577689ba5485ed1931752c341ec25522bb8e8a (diff) | |
| download | efi-boot-shim-70ce2c420484ef964b6443c102bfd78c29965e10.tar.gz efi-boot-shim-70ce2c420484ef964b6443c102bfd78c29965e10.zip | |
Improve our debuginfo path print
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'shim.c')
| -rw-r--r-- | shim.c | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -2151,7 +2151,7 @@ debug_hook(void) UINT8 *data = NULL; UINTN dataSize = 0; EFI_STATUS efi_status; - volatile register int x = 0; + volatile register UINTN x = 0; extern char _text, _data; if (x) @@ -2162,19 +2162,28 @@ debug_hook(void) return; } - Print(L"add-symbol-file /usr/lib/debug/usr/share/shim/" - EFI_ARCH"/shim.debug 0x%08x -s .data 0x%08x\n", &_text, + Print(L"add-symbol-file "DEBUGDIR + L"shim.debug 0x%08x -s .data 0x%08x\n", &_text, &_data); Print(L"Pausing for debugger attachment.\n"); + Print(L"To disable this, remove the EFI variable SHIM_DEBUG-%g .\n", + &guid); x = 1; - while (x) { + while (x++) { + /* Make this so it can't /totally/ DoS us. */ #if defined(__x86_64__) || defined(__i386__) || defined(__i686__) + if (x > 4294967294) + break; __asm__ __volatile__("pause"); #elif defined(__aarch64__) + if (x > 1000) + break; __asm__ __volatile__("wfi"); #else - uefi_call_wrapper(BS->Stall, 1, 50000); + if (x > 12000) + break; + uefi_call_wrapper(BS->Stall, 1, 5000); #endif } x = 1; |