private class CLaplace extends Common.Laplace {\r
public String operation(String wholeline) {\r
boolean addr8 = false;\r
-\r
// remove EFI_DRIVER_ENTRY_POINT\r
- wholeline = wholeline.replaceAll("(EFI_\\w+_ENTRY_POINT)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
+ wholeline = wholeline.replaceAll("(EFI_[A-Z]+_ENTRY_POINT\\s*\\(\\s*" + mi.entrypoint + "\\s*\\)\\s*;)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
+ // redefine module entry point for some self-relocated modules\r
+ wholeline = wholeline.replaceAll (mi.entrypoint + "([^{]*?})", "_ModuleEntryPoint" + "$1");\r
// remove R8 library contractor\r
wholeline = wholeline.replaceAll ("(\\b(?:Efi|Dxe)InitializeDriverLib\\b)", MigrationTool.MIGRATIONCOMMENT + " $1");\r
// Add Library Class for potential reference of gBS, gRT & gDS.\r