This commit is contained in:
SergeySlice 2020-11-09 20:02:29 +03:00
commit 03d017279b
13 changed files with 535 additions and 72 deletions

4
.gitignore vendored
View File

@ -108,7 +108,6 @@ build/
!default.mode2v3
!default.perspectivev3
xcuserdata/
xcshareddata/
# Translation files
CloverUpdater.strings
@ -125,4 +124,7 @@ tools
#Eclipse build folder
/DEBUG_*/
/RELEASE_*/
#copy I make sometimes
/rEFIt_UEFI copy*/

View File

@ -119,17 +119,17 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL>
$(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
@"echo" [CPP] ${s_base}
$(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
<Command.GCC, Command.RVCT>
@"echo" [CPP] ${s_base}
# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
$(AT)"$(CC)" $(CXX_FLAGS) -c -o ${dst} $(INC) ${src}
@"echo" [CPP] ${s_base}
<Command.XCODE>
$(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
@"echo" [CPP] ${s_base}
$(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
[C-Code-File]
<InputFile>
@ -145,17 +145,17 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL>
$(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
@"echo" [CPP] ${s_base}
$(AT)"$(CC)" /Fo${dst} $(CC_FLAGS) $(INC) ${src}
<Command.GCC, Command.RVCT>
@"echo" [CC] ${s_base}
# For RVCTCYGWIN CC_FLAGS must be first to work around pathing issues
$(AT)"$(CC)" $(CC_FLAGS) -c -o ${dst} $(INC) ${src}
@"echo" [CC] ${s_base}
<Command.XCODE>
$(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
@"echo" [CC] ${s_base}
$(AT)"$(CC)" $(CC_FLAGS) -o ${dst} $(INC) ${src}
[C-Code-File.BASE.AARCH64,C-Code-File.SEC.AARCH64,C-Code-File.PEI_CORE.AARCH64,C-Code-File.PEIM.AARCH64,C-Code-File.BASE.ARM,C-Code-File.SEC.ARM,C-Code-File.PEI_CORE.ARM,C-Code-File.PEIM.ARM]
<InputFile>
@ -168,6 +168,7 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.GCC, Command.RVCT>
@"echo" [CC] ${s_base}
$(AT)"$(CC)" $(CC_FLAGS) $(CC_XIPFLAGS) -c -o ${dst} $(INC) ${src}
[C-Header-File]
@ -192,18 +193,18 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.MSFT, Command.INTEL>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
@"echo" [ASM] ${s_base}
<Command.GCC, Command.RVCT>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
#--trim-long
# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
$(AT)"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
@"echo" [ASM] ${s_base}
[Assembly-Code-File.COMMON.ARM,Assembly-Code-File.COMMON.AARCH64]
# Remove --convert-hex for ARM as it breaks MSFT assemblers
@ -220,23 +221,23 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command.INTEL>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
@"echo" [ASM] ${s_base}
<Command.MSFT>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(ASM)" /Fo${dst} $(ASM_FLAGS) /I${s_path} $(INC) ${d_path}(+)${s_base}.iii
@"echo" [ASM] ${s_base}
<Command.GCC, Command.RVCT>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
# For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
$(AT)"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
@"echo" [ASM] ${s_base}
[Nasm-Assembly-Code-File.COMMON.COMMON]
<InputFile>
@ -249,10 +250,10 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
<Command>
@"echo" [NASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
@"echo" [NASM] ${s_base}
[Device-Tree-Source-File]
<InputFile>
@ -265,9 +266,9 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dtb
<Command.GCC>
@"echo" [DTC] ${s_base}
$(AT)"$(DTCPP)" $(DTCPP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)"$(DTC)" $(DTC_FLAGS) -I dts -O dtb -o ${dst} ${d_path}(+)${s_base}.i
@"echo" [DTC] ${s_base}
[Visual-Form-Representation-File]
<InputFile>
@ -282,9 +283,9 @@
$(DEBUG_DIR)(+)${s_dir}(+)${s_base}.c
<Command>
@"echo" [VFR] $(MODULE_NAME)
$(AT)"$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_base}.i
$(AT)"$(VFR)" $(VFR_FLAGS) --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_base}.i
@"echo" [VFR] $(MODULE_NAME)
[Object-File]
<InputFile>
@ -295,26 +296,26 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME).lib
<Command.MSFT, Command.INTEL>
$(AT)"$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)
@"echo" [SLINK] $(MODULE_NAME)
$(AT)"$(SLINK)" $(SLINK_FLAGS) /OUT:${dst} @$(OBJECT_FILES_LIST)
<Command.GCC>
@"echo" [SLINK] $(MODULE_NAME)
$(AT)$(RM) ${dst}
$(AT)"$(SLINK)" -cr ${dst} $(SLINK_FLAGS) @$(OBJECT_FILES_LIST)
@"echo" [SLINK] $(MODULE_NAME)
<Command.RVCT>
$(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
@"echo" [SLINK] $(MODULE_NAME)
$(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} --via $(OBJECT_FILES_LIST)
<Command.RVCTCYGWIN>
@"echo" [SLINK] $(MODULE_NAME)
# $(OBJECT_FILES_LIST) has wrong paths for cygwin
$(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} $(OBJECT_FILES)
@"echo" [SLINK] $(MODULE_NAME)
<Command.XCODE>
$(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
@"echo" [SLINK] $(MODULE_NAME)
$(AT)"$(SLINK)" $(SLINK_FLAGS) ${dst} -filelist $(OBJECT_FILES_LIST)
[Static-Library-File]
<InputFile>
@ -327,27 +328,27 @@
$(DEBUG_DIR)(+)$(MODULE_NAME).dll
<Command.MSFT, Command.INTEL>
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK2_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
$(AT)"$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
@"echo" [DLINK] $(MODULE_NAME)
<Command.GCC>
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
$(AT)"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
@"echo" [DLINK] $(MODULE_NAME)
<Command.RVCT>
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
<Command.RVCTCYGWIN>
@"echo" [DLINK] $(MODULE_NAME)
#$(STATIC_LIBRARY_FILES_LIST) has wrong paths for cygwin
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
<Command.XCODE>
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
[Static-Library-File.SEC.AARCH64, Static-Library-File.PEI_CORE.AARCH64, Static-Library-File.PEIM.AARCH64,Static-Library-File.SEC.ARM, Static-Library-File.PEI_CORE.ARM, Static-Library-File.PEIM.ARM]
@ -361,9 +362,9 @@
$(DEBUG_DIR)(+)$(MODULE_NAME).dll
<Command.GCC>
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_XIPFLAGS) -Wl,--start-group,@$(STATIC_LIBRARY_FILES_LIST),--end-group $(CC_FLAGS) $(CC_XIPFLAGS) $(DLINK2_FLAGS)
$(AT)"$(OBJCOPY)" $(OBJCOPY_FLAGS) ${dst}
@"echo" [DLINK] $(MODULE_NAME)
[Static-Library-File.USER_DEFINED, Static-Library-File.HOST_APPLICATION]
@ -377,25 +378,25 @@
$(DEBUG_DIR)(+)$(MODULE_NAME)
<Command.MSFT, Command.INTEL>
$(AT)"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" $(DLINK_FLAGS) $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST)
<Command.GCC>
$(AT)"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" $(DLINK_FLAGS) $(GCCLINK_PREFIX)--start-group $(DLINK_SPATH) @$(STATIC_LIBRARY_FILES_LIST) $(GCCLINK_PREFIX)--end-group $(DLINK2_FLAGS)
<Command.RVCT>
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) --via $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
<Command.RVCTCYGWIN>
@"echo" [DLINK] $(MODULE_NAME)
#$(STATIC_LIBRARY_FILES_LIST) has the wrong paths for cygwin
$(AT)"$(DLINK)" $(DLINK_FLAGS) -o ${dst} $(DLINK_SPATH) $(STATIC_LIBRARY_FILES) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
<Command.XCODE>
$(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
@"echo" [DLINK] $(MODULE_NAME)
$(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) $(DLINK_SPATH) -filelist $(STATIC_LIBRARY_FILES_LIST) $(DLINK2_FLAGS)
[Dynamic-Library-File]
@ -406,14 +407,15 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME).efi
<Command.MSFT, Command.INTEL, Command.RVCT>
@"echo" [GENFW] $(MODULE_NAME)
$(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
$(AT)$(CP) ${dst} $(DEBUG_DIR)
$(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
-$(AT)$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
@"echo" [GENFW] $(MODULE_NAME)
<Command.GCC>
@"echo" [OBJCOPY] $(MODULE_NAME)
$(AT)$(OBJCOPY) --only-keep-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
#$(AT)$(OBJCOPY) --strip-debug ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
#$(AT)$(OBJCOPY) --strip-unneeded -R .eh_frame ${src}
@ -423,26 +425,25 @@
#
-$(AT)$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
$(AT)$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
@"echo" [OBJCOPY] $(MODULE_NAME)
@"echo" [GENFW] $(MODULE_NAME)
$(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
$(AT)$(CP) ${dst} $(DEBUG_DIR)
$(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
@"echo" [GENFW] $(MODULE_NAME)
<Command.XCODE>
@"echo" [MTOC] $(MODULE_NAME)
# tool to convert Mach-O to PE/COFF
#"$(STRIP)" ${src}
$(AT)"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff
@"echo" [MTOC] $(MODULE_NAME)
# create symbol file for GDB debug
-$(AT)$(DSYMUTIL) ${src}
@"echo" [GENFW] $(MODULE_NAME)
$(AT)"$(GENFW)" -e $(MODULE_TYPE) -o ${dst} $(DEBUG_DIR)(+)$(MODULE_NAME).pecoff $(GENFW_FLAGS)
$(AT)$(CP) ${dst} $(DEBUG_DIR)
$(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).efi
-$(AT)$(CP) $(DEBUG_DIR)(+)*.map $(OUTPUT_DIR)
@"echo" [GENFW] $(MODULE_NAME)
[Dependency-Expression-File]
<InputFile>
@ -455,10 +456,10 @@
$(MAKE_FILE)
<Command>
@"echo" [DEPEX] $(MODULE_NAME)
$(AT)"$(PP)" $(APP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
$(AT)Trim --source-code -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
$(AT)GenDepex -t $(MODULE_TYPE) -o ${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
@"echo" [DEPEX] $(MODULE_NAME)
[Acpi-Source-Language-File]
<InputFile>
@ -477,12 +478,12 @@
$(AT)"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
<Command.GCC>
@"echo" [ASLPP] ${s_base}
$(AT)Trim --asl-file -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i -i $(INC_LIST) ${src}
$(AT)"$(ASLPP)" $(ASLPP_FLAGS) $(INC) -I${s_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
@"echo" [ASLPP] ${s_base}
@"echo" [ASLBIN] ${s_base}
$(AT)Trim --source-code -l -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii
$(AT)"$(ASL)" $(ASL_FLAGS) $(ASL_OUTFLAGS)${dst} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iiii
@"echo" [ASLBIN] ${s_base}
[C-Code-File.AcpiTable]
<InputFile>
@ -500,11 +501,11 @@
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
<Command.GCC>
@"echo" [ASLDLINK] ${s_base}
$(AT)"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
$(AT)"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
@"echo" [ASLDLINK] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
@"echo" [GENFW] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
[Acpi-Table-Code-File]
<InputFile>
@ -522,11 +523,11 @@
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
<Command.GCC>
@"echo" [ASLDLINK-ACPI] ${s_base}
$(AT)"$(ASLCC)" -c -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(CC_FLAGS) $(ASLCC_FLAGS) $(INC) ${src}
$(AT)"$(ASLDLINK)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(ASLDLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
@"echo" [ASLDLINK-ACPI] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
@"echo" [GENFW-ACPI] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(GENFW_FLAGS)
<Command.XCODE>
@"echo" [ASLCC-ACPI] $(MODULE_NAME)
@ -536,8 +537,8 @@
@"echo" [MTOC-ACPI] $(MODULE_NAME)
#"$(STRIP)" ${src}
$(AT)"$(MTOC)" -subsystem $(MODULE_TYPE) $(MTOC_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.dll $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.efi
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)
@"echo" [GENFW-ACPI] $(MODULE_NAME)
$(AT)"$(GENFW)" -o ${dst} -c $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.pecoff $(GENFW_FLAGS)
[Masm16-Code-File]
@ -551,27 +552,27 @@
$(OUTPUT_DIR)(+)${s_base}.com
<Command.MSFT, Command.INTEL>
@"echo" [ASM] $(s_base)
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code --convert-hex --trim-long -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)cd $(OUTPUT_DIR)(+)${s_dir}
$(AT)"$(ASM16)" /nologo /c /omf $(INC) /Fo$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj ${d_path}(+)${s_base}.iii
$(AT)"$(ASMLINK)" $(ASMLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj,${dst},,,,
@"echo" [ASM] $(s_base)
<Command.GCC>
@"echo" [ASM] $(s_base)
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
$(AT)"$(DLINK)" -o ${dst} $(DLINK_FLAGS) --start-group $(DLINK_SPATH) $(LIBS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj --end-group
@"echo" [ASM] $(s_base)
<Command.XCODE>
@"echo" [ASM] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(ASM)" -o $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj $(ASM_FLAGS) $(INC) ${d_path}(+)${s_base}.iii
$(AT)"$(SLINK)" $(SLINK_FLAGS) $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
$(AT)otool -t $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.slib | hex2bin.py ${dst}
@"echo" [ASM] ${s_base}
[Nasm-to-Binary-Code-File]
@ -585,10 +586,10 @@
$(OUTPUT_DIR)(+)${s_base}.bin
<Command>
@"echo" [NASMB] ${s_base}
$(AT)"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
$(AT)Trim --source-code --convert-hex -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
$(AT)"$(NASM)" -I${s_path}(+) -l ${d_path}(+)${s_base}.lst $(NASMB_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
@"echo" [NASMB] ${s_base}
# copy the output file with .com postfix that be same to the output file of .asm16
$(AT)$(CP) ${dst} $(OUTPUT_DIR)(+)${s_base}.com
@ -600,6 +601,7 @@
$(OUTPUT_DIR)(+)${s_base}.mcb
<Command>
@"echo" [GENFW] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -m ${src} $(GENFW_FLAGS)
[Microcode-Binary-File]
@ -613,6 +615,7 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME).bin
<Command>
@"echo" [GENFW] ${s_base}
$(AT)"$(GENFW)" -o ${dst} -j $(MICROCODE_BINARY_FILES) $(GENFW_FLAGS)
-$(AT)$(CP) ${dst} $(BIN_DIR)(+)$(MODULE_NAME_GUID).bin
@ -689,6 +692,7 @@
$(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.hpk
<Command>
@"echo" [VFR] ${s_base}
"$(VFRPP)" $(VFRPP_FLAGS) $(INC) ${src} > $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
"$(VFR)" $(VFR_FLAGS) --create-ifr-package --string-db $(OUTPUT_DIR)(+)$(MODULE_NAME)StrDefs.hpk --output-directory $(OUTPUT_DIR)(+)${s_dir} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.i
@ -703,17 +707,17 @@
$(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
<Command.MSFT, Command.INTEL>
@"echo" [GENFW-HII] $(MODULE_NAME)
$(AT)"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiipackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
$(AT)"$(RC)" /Fo${dst} $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc
@"echo" [GENFW-HII] $(MODULE_NAME)
<Command.GCC>
@"echo" [GENFW-HII] $(MODULE_NAME)
$(AT)"$(GENFW)" -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES) $(GENFW_FLAGS)
$(AT)"$(RC)" $(RC_FLAGS) $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc ${dst}
@"echo" [GENFW-HII] $(MODULE_NAME)
<Command.XCODE, Command.RVCT>
$(AT)GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)
@"echo" [GENFW-HII] $(MODULE_NAME)
$(AT)GenFw -o $(OUTPUT_DIR)(+)$(MODULE_NAME)hii.rc -g $(MODULE_GUID) --hiibinpackage $(HII_BINARY_PACKAGES)

View File

@ -525,6 +525,17 @@ ScanSections64 (
mCoffOffset = mCoffAlignment;
}
//
// List all sections.
//
for (i = 0; i < mEhdr->e_shnum; i++) {
Elf_Shdr *shdr = GetShdrByIndex(i);
Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
CHAR8* sectName = ((CHAR8*)mEhdr) + Namedr->sh_offset + shdr->sh_name;
NormalMsg("section %d %s sh_addr_in_memory_image=%llu(0x%llx) sh_offset_in_file=%llu(0x%llx) sh_size=%llu(0x%llx) sh_addralign=%llu sh_flags=0x%llx", i, sectName, shdr->sh_addr, shdr->sh_addr, shdr->sh_offset, shdr->sh_offset, shdr->sh_size, shdr->sh_size, shdr->sh_addralign, shdr->sh_flags);
}
//
// First text sections.
//
@ -534,17 +545,15 @@ ScanSections64 (
SectionCount = 0;
for (i = 0; i < mEhdr->e_shnum; i++) {
Elf_Shdr *shdr = GetShdrByIndex(i);
Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
CHAR8* sectName = ((CHAR8*)mEhdr) + Namedr->sh_offset + shdr->sh_name;
/*debug*/Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
/*debug*/CHAR8* sectName = ((CHAR8*)mEhdr) + Namedr->sh_offset + shdr->sh_name;
if (IsTextShdr(shdr)) {
if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {
// the alignment field is valid
if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {
// if the section address is aligned we must align PE/COFF
UINT32 mCoffOffsetNew = (UINT32) ((shdr->sh_addr + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
mCoffOffset = (UINT32) ((mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
printf("Section %d %s mCoffOffset=%d(0x%x) mCoffOffsetNew=%d(0x%x) diff=%d(0x%x)\n", i, sectName, mCoffOffset, mCoffOffset, mCoffOffsetNew, mCoffOffsetNew, mCoffOffsetNew-mCoffOffset, mCoffOffsetNew-mCoffOffset);
mCoffOffset=mCoffOffsetNew;
/*debug*/NormalMsg("Text section %d %s size=%llu mCoffOffset=%d(0x%x)", i, sectName, shdr->sh_size, mCoffOffset, mCoffOffset);
} else {
Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment.");
}
@ -590,17 +599,15 @@ mCoffOffset=mCoffOffsetNew;
SectionCount = 0;
for (i = 0; i < mEhdr->e_shnum; i++) {
Elf_Shdr *shdr = GetShdrByIndex(i);
Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
CHAR8* sectName = ((CHAR8*)mEhdr) + Namedr->sh_offset + shdr->sh_name;
/*debug*/Elf_Shdr *Namedr = GetShdrByIndex(mEhdr->e_shstrndx);
/*debug*/CHAR8* sectName = ((CHAR8*)mEhdr) + Namedr->sh_offset + shdr->sh_name;
if (IsDataShdr(shdr)) {
if ((shdr->sh_addralign != 0) && (shdr->sh_addralign != 1)) {
// the alignment field is valid
if ((shdr->sh_addr & (shdr->sh_addralign - 1)) == 0) {
// if the section address is aligned we must align PE/COFF
UINT32 mCoffOffsetNew = (UINT32) ((shdr->sh_addr + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
mCoffOffset = (UINT32) ((mCoffOffset + shdr->sh_addralign - 1) & ~(shdr->sh_addralign - 1));
printf("Section %d %s mCoffOffset=%d(0x%x) mCoffOffsetNew=%d(0x%x) diff=%d(0x%x)\n", i, sectName, mCoffOffset, mCoffOffset, mCoffOffsetNew, mCoffOffsetNew, mCoffOffsetNew-mCoffOffset, mCoffOffsetNew-mCoffOffset);
mCoffOffset=mCoffOffsetNew;
/*debug*/NormalMsg("Data section %d %s size=%llu mCoffOffset=%d(0x%x)", i, sectName, shdr->sh_size, mCoffOffset, mCoffOffset);
} else {
Error (NULL, 0, 3000, "Invalid", "Section address not aligned to its own alignment.");
}
@ -673,6 +680,7 @@ mCoffOffset=mCoffOffsetNew;
//
// Allocate base Coff file. Will be expanded later for relocations.
//
NormalMsg("Allocate %d bytes for mCoffFile", mCoffOffset);
mCoffFile = (UINT8 *)malloc(mCoffOffset);
if (mCoffFile == NULL) {
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
@ -1026,8 +1034,8 @@ WriteSections64 (
}
} else if (mEhdr->e_machine == EM_AARCH64) {
INT64 Offset;
switch (ELF_R_TYPE(Rel->r_info)) {
INT64 Offset;
case R_AARCH64_LD64_GOT_LO12_NC:
//

View File

@ -1161,6 +1161,8 @@ Returns:
OutputFileTime = 0;
ZeroDebugFlag = FALSE;
SetPrintLevel(INFO_LOG_LEVEL + 1);
if (argc == 1) {
Error (NULL, 0, 1001, "Missing options", "No input options.");
Usage ();
@ -1381,6 +1383,14 @@ Returns:
argv ++;
continue;
}
if ((stricmp (argv[0], "--info") == 0)) {
SetPrintLevel (INFO_LOG_LEVEL);
NormalMsg ("Info output Mode Set!");
argc --;
argv ++;
continue;
}
if ((stricmp (argv[0], "-q") == 0) || (stricmp (argv[0], "--quiet") == 0)) {
SetPrintLevel (KEY_LOG_LEVEL);

View File

@ -0,0 +1,310 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objects = {
/* Begin PBXBuildFile section */
9AC31D3725592B0400ABC5D3 /* libCommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC31D3625592B0400ABC5D3 /* libCommon.a */; };
9AD17D112559286100D22C6A /* Elf32Convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 9AD17D102559286100D22C6A /* Elf32Convert.c */; };
9AD17D132559286800D22C6A /* Elf64Convert.c in Sources */ = {isa = PBXBuildFile; fileRef = 9AD17D122559286800D22C6A /* Elf64Convert.c */; };
9AD17D152559286F00D22C6A /* ElfConvert.c in Sources */ = {isa = PBXBuildFile; fileRef = 9AD17D142559286F00D22C6A /* ElfConvert.c */; };
9AD17D172559287800D22C6A /* GenFw.c in Sources */ = {isa = PBXBuildFile; fileRef = 9AD17D162559287800D22C6A /* GenFw.c */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
9A9A3A852559281100B97949 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = /usr/share/man/man1/;
dstSubfolderSpec = 0;
files = (
);
runOnlyForDeploymentPostprocessing = 1;
};
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
9A9A3A872559281200B97949 /* GenFw */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = GenFw; sourceTree = BUILT_PRODUCTS_DIR; };
9AC31D3625592B0400ABC5D3 /* libCommon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCommon.a; path = ../libs/libCommon.a; sourceTree = "<group>"; };
9AD17D102559286100D22C6A /* Elf32Convert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Elf32Convert.c; sourceTree = "<group>"; };
9AD17D122559286800D22C6A /* Elf64Convert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Elf64Convert.c; sourceTree = "<group>"; };
9AD17D142559286F00D22C6A /* ElfConvert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ElfConvert.c; sourceTree = "<group>"; };
9AD17D162559287800D22C6A /* GenFw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = GenFw.c; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
9A9A3A842559281100B97949 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9AC31D3725592B0400ABC5D3 /* libCommon.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
9A9A3A7E2559281100B97949 = {
isa = PBXGroup;
children = (
9A9A3A892559281200B97949 /* GenFw */,
9A9A3A882559281200B97949 /* Products */,
);
sourceTree = "<group>";
};
9A9A3A882559281200B97949 /* Products */ = {
isa = PBXGroup;
children = (
9A9A3A872559281200B97949 /* GenFw */,
);
name = Products;
sourceTree = "<group>";
};
9A9A3A892559281200B97949 /* GenFw */ = {
isa = PBXGroup;
children = (
9AD17D102559286100D22C6A /* Elf32Convert.c */,
9AD17D122559286800D22C6A /* Elf64Convert.c */,
9AD17D142559286F00D22C6A /* ElfConvert.c */,
9AD17D162559287800D22C6A /* GenFw.c */,
9AC31D3625592B0400ABC5D3 /* libCommon.a */,
);
name = GenFw;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
9A9A3A862559281100B97949 /* GenFw */ = {
isa = PBXNativeTarget;
buildConfigurationList = 9A9A3A8E2559281200B97949 /* Build configuration list for PBXNativeTarget "GenFw" */;
buildPhases = (
9A9A3A832559281100B97949 /* Sources */,
9A9A3A842559281100B97949 /* Frameworks */,
9A9A3A852559281100B97949 /* CopyFiles */,
);
buildRules = (
);
dependencies = (
);
name = GenFw;
productName = GenFw;
productReference = 9A9A3A872559281200B97949 /* GenFw */;
productType = "com.apple.product-type.tool";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
9A9A3A7F2559281100B97949 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1120;
ORGANIZATIONNAME = Jief;
TargetAttributes = {
9A9A3A862559281100B97949 = {
CreatedOnToolsVersion = 11.2;
};
};
};
buildConfigurationList = 9A9A3A822559281100B97949 /* Build configuration list for PBXProject "GenFw" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 9A9A3A7E2559281100B97949;
productRefGroup = 9A9A3A882559281200B97949 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
9A9A3A862559281100B97949 /* GenFw */,
);
};
/* End PBXProject section */
/* Begin PBXSourcesBuildPhase section */
9A9A3A832559281100B97949 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
9AD17D152559286F00D22C6A /* ElfConvert.c in Sources */,
9AD17D112559286100D22C6A /* Elf32Convert.c in Sources */,
9AD17D132559286800D22C6A /* Elf64Convert.c in Sources */,
9AD17D172559287800D22C6A /* GenFw.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
9A9A3A8C2559281200B97949 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = NO;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../Common",
"$(PROJECT_DIR)/../Include",
"$(PROJECT_DIR)/../Include/Common",
"$(PROJECT_DIR)/../Include/X64",
"$(PROJECT_DIR)/../Include/IndustryStandard",
);
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../libs";
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
name = Debug;
};
9A9A3A8D2559281200B97949 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = NO;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/../Common",
"$(PROJECT_DIR)/../Include",
"$(PROJECT_DIR)/../Include/Common",
"$(PROJECT_DIR)/../Include/X64",
"$(PROJECT_DIR)/../Include/IndustryStandard",
);
LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../libs";
MACOSX_DEPLOYMENT_TARGET = 10.14;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
};
name = Release;
};
9A9A3A8F2559281200B97949 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
9A9A3A902559281200B97949 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
9A9A3A822559281100B97949 /* Build configuration list for PBXProject "GenFw" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9A9A3A8C2559281200B97949 /* Debug */,
9A9A3A8D2559281200B97949 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
9A9A3A8E2559281200B97949 /* Build configuration list for PBXNativeTarget "GenFw" */ = {
isa = XCConfigurationList;
buildConfigurations = (
9A9A3A8F2559281200B97949 /* Debug */,
9A9A3A902559281200B97949 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 9A9A3A7F2559281100B97949 /* Project object */;
}

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:GenFw.xcodeproj">
</FileRef>
</Workspace>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>

View File

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1120"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9A9A3A862559281100B97949"
BuildableName = "GenFw"
BlueprintName = "GenFw"
ReferencedContainer = "container:GenFw.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "YES"
customWorkingDirectory = "/JiefLand/5.Devel/Clover/Clover-projects/Clover--CloverHackyColor--master.2/Build/Clover/RELEASE_GCC53/X64/rEFIt_UEFI/refit/DEBUG"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9A9A3A862559281100B97949"
BuildableName = "GenFw"
BlueprintName = "GenFw"
ReferencedContainer = "container:GenFw.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "--info"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-e UEFI_APPLICATION"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "-o CloverX64.efi"
isEnabled = "YES">
</CommandLineArgument>
<CommandLineArgument
argument = "CloverX64.dll"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9A9A3A862559281100B97949"
BuildableName = "GenFw"
BlueprintName = "GenFw"
ReferencedContainer = "container:GenFw.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

View File

@ -31,6 +31,8 @@
# VALID_ARCHITECTURES = IA32 X64
#
# Jief : The only reason we need this, is because MSVC needs memcpy and memset to be compiled without /GL
[Sources]
memory.cpp
@ -46,4 +48,3 @@
[BuildOptions]
MSFT:*_*_*_CC_FLAGS = /GL-
GCC:*_*_*_CC_FLAGS = -Os -fno-lto

View File

@ -14,13 +14,13 @@ extern "C" {
*/
#ifdef __GNUC__
//void* memset(void* dst, int ch, UINTN count) __attribute__ ((used));
//void* memcpy(void* dst, const void* src, UINT64 count) __attribute__ ((used));
#else
// void* memset(void* dst, int ch, UINT64 count);
//void* memcpy(void* dst, const void* src, UINT64 count);
#endif
// Jief : I think __attribute__ ((used)) was needed for older version of GCC, can't remember.
// If you want to put it back, do it only for the compiler version that really needs it.
// Nov 2020 : With Gcc 10.2, defining it for memset is ok, but not needed. Defining it for memcpy generates an error in GenFW.
//#ifdef __GNUC__
// void* memset(void* dst, int ch, UINTN count) __attribute__ ((used));
// void* memcpy(void* dst, const void* src, UINTN count) __attribute__ ((used));
//#endif
void* memset(void* dst, int ch, UINTN count)
{

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

View File

@ -84,9 +84,9 @@ ctor_ptr* pend = (ctor_ptr*)&__end_of_section_ctors;
void construct_globals_objects(EFI_HANDLE ImageHandle)
{
(void)ImageHandle;
DBG("CTOR %llX %lld\n", (UINTN)p, (UINTN)p);
DBG("CTORS %llX(%lld) size %ld\n", (UINTN)p, (UINTN)p, pend-p );
while ( p < pend ) {
DBG("CTOR %llX %lld\n", (UINTN)p[0], (UINTN)p[0]);
DBG("CTOR %llX(%lld)\n", (UINTN)p[0], (UINTN)p[0]);
(*p)();
p++;
}