diff options
| author | olivier <olivier@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-24 19:35:09 +0000 |
|---|---|---|
| committer | olivier <olivier@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2017-06-24 19:35:09 +0000 |
| commit | ee150d8d9dec5db80d055d746b82dd688072e468 (patch) | |
| tree | 7fd5bb5d18d1b2b1f4ac52e40a5615f072bd97e7 | |
| parent | 6c1ebfcb2d4f3318931eb87a57661853785808a4 (diff) | |
| download | fpc-ee150d8d9dec5db80d055d746b82dd688072e468.tar.gz | |
* Exceptions do not work yet. Commented out for now...
git-svn-id: https://svn.freepascal.org/svn/fpc/branches/olivier@36593 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | uefi/rtl/uefi/system.pp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/uefi/rtl/uefi/system.pp b/uefi/rtl/uefi/system.pp index c92987ab70..49e518e062 100644 --- a/uefi/rtl/uefi/system.pp +++ b/uefi/rtl/uefi/system.pp @@ -13,7 +13,7 @@ **********************************************************************} unit System; - + interface {$define DISABLE_NO_THREAD_MANAGER} @@ -491,7 +491,7 @@ end; function EFI_MAIN( imageHandle: EFI_HANDLE; systemTable : PEFI_SYSTEM_TABLE): EFI_STATUS; cdecl; [public, alias: 'EFI_MAIN']; begin - try + //try SysTable := systemTable^; SysTable.ConOut^.OutputString(SysTable.ConOut, 'EFI_MAIN start' + #13#10); @@ -535,10 +535,13 @@ begin SysTable.ConOut^.OutputString(SysTable.ConOut, #13#10); PascalMain; - WriteLn('End of EFI_MAIN'); - except - WriteLn('Exception in EFI_MAIN'); - end; + WriteLn('End of EFI_MAIN...'); + //except +// Result := EFI_INVALID_PARAMETER; +// WriteLn('Exception in EFI_MAIN'); + //end; + Result := EFI_SUCCESS; + SysTable.ConOut^.OutputString(SysTable.ConOut, 'EFI_MAIN real end' + #13#10); end; {***************************************************************************** System Dependent Exit code |