Browse Source

* Exceptions do not work yet. Commented out for now...

git-svn-id: branches/olivier/uefi@36593 -
olivier 8 years ago
parent
commit
10e58ef95e
1 changed files with 9 additions and 6 deletions
  1. 9 6
      rtl/uefi/system.pp

+ 9 - 6
rtl/uefi/system.pp

@@ -13,7 +13,7 @@
 
 
  **********************************************************************}
  **********************************************************************}
 unit System;
 unit System;
-
+ 
 interface
 interface
 
 
 {$define DISABLE_NO_THREAD_MANAGER}
 {$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'];
 function EFI_MAIN( imageHandle: EFI_HANDLE; systemTable : PEFI_SYSTEM_TABLE): EFI_STATUS; cdecl; [public, alias: 'EFI_MAIN'];
 begin
 begin
- try
+ //try
   SysTable := systemTable^;
   SysTable := systemTable^;
 
 
   SysTable.ConOut^.OutputString(SysTable.ConOut, 'EFI_MAIN start' + #13#10);
   SysTable.ConOut^.OutputString(SysTable.ConOut, 'EFI_MAIN start' + #13#10);
@@ -535,10 +535,13 @@ begin
   SysTable.ConOut^.OutputString(SysTable.ConOut, #13#10);
   SysTable.ConOut^.OutputString(SysTable.ConOut, #13#10);
 
 
   PascalMain;
   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;
 end;
 {*****************************************************************************
 {*****************************************************************************
                          System Dependent Exit code
                          System Dependent Exit code