diff options
author | Shakeeb <shakeebbk@in.ibm.com> | 2016-08-31 15:15:19 -0500 |
---|---|---|
committer | AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com> | 2016-09-01 07:07:29 -0400 |
commit | 1008ef70a71fcfdec398ff30923d5025991c85f4 (patch) | |
tree | b22fc2a7cf2c8414ca20dfc7489a7f6d1a145878 | |
parent | 28cb5c42ddba0cb9d2a86f43785c60499170ef2f (diff) | |
download | talos-sbe-1008ef70a71fcfdec398ff30923d5025991c85f4.tar.gz talos-sbe-1008ef70a71fcfdec398ff30923d5025991c85f4.zip |
SBE code restructure: cleanup
Change-Id: I354cc79ba25b843fdb1a7524a19b8d0c41bd9051
RTC:159709
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/29060
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
-rwxr-xr-x | env.bash | 2 | ||||
-rwxr-xr-x | sb | 2 | ||||
-rw-r--r-- | src/build/Makefile | 89 | ||||
-rwxr-xr-x | src/build/buildInfo.py | 3 | ||||
-rw-r--r-- | src/build/img_defs.mk | 20 | ||||
-rwxr-xr-x | src/build/linkerscripts/linkloader.cmd | 3 | ||||
-rw-r--r-- | src/build/linkerscripts/linksbe.cmd | 3 | ||||
-rw-r--r-- | src/build/linkerscripts/linkseeprom.cmd | 3 | ||||
-rwxr-xr-x | src/build/parsAndCutElf.py | 6 | ||||
-rw-r--r-- | src/build/topfiles.mk | 3 | ||||
-rw-r--r-- | src/build/utils/Makefile | 43 | ||||
-rw-r--r-- | src/build/utils/base_ppe_header.S (renamed from src/build/base_ppe_header.S) | 2 | ||||
-rw-r--r-- | src/build/utils/base_sbe_fixed.S (renamed from src/build/base_sbe_fixed.S) | 2 | ||||
-rw-r--r-- | src/build/utils/p9_sbe.H (renamed from src/build/p9_sbe.H) | 2 | ||||
-rw-r--r-- | src/build/utils/proc_sbe_fixed.H (renamed from src/build/proc_sbe_fixed.H) | 2 | ||||
-rw-r--r-- | src/build/utils/sbe_common.H (renamed from src/build/sbe_common.H) | 2 | ||||
-rw-r--r-- | src/build/utils/sbe_link.H (renamed from src/build/sbe_link.H) | 2 | ||||
-rw-r--r-- | src/build/utils/utils.mk | 27 | ||||
-rwxr-xr-x | src/test/framework/autocitest (renamed from src/test/citest/autocitest) | 2 | ||||
-rwxr-xr-x | src/test/framework/build-script (renamed from src/test/citest/build-script) | 4 | ||||
-rwxr-xr-x | src/test/framework/check-copyright (renamed from src/test/citest/check-copyright) | 4 | ||||
-rwxr-xr-x | src/test/framework/copyright-check.sh (renamed from src/test/citest/copyright-check.sh) | 2 | ||||
-rwxr-xr-x | src/test/framework/create-sandbox (renamed from src/test/citest/create-sandbox) | 2 | ||||
-rw-r--r-- | src/test/framework/etc/patches/chip.act.patch (renamed from src/test/citest/etc/patches/chip.act.patch) | 0 | ||||
-rw-r--r-- | src/test/framework/etc/patches/patchlist.txt (renamed from src/test/citest/etc/patches/patchlist.txt) | 0 | ||||
-rw-r--r-- | src/test/framework/etc/patches/pervasive.act.patch (renamed from src/test/citest/etc/patches/pervasive.act.patch) | 0 | ||||
-rw-r--r-- | src/test/framework/etc/patches/powermgmt.act.patch (renamed from src/test/citest/etc/patches/powermgmt.act.patch) | 0 | ||||
-rw-r--r-- | src/test/framework/etc/patches/standalone.simics.patch (renamed from src/test/citest/etc/patches/standalone.simics.patch) | 0 | ||||
-rwxr-xr-x | src/test/framework/etc/workarounds.postsimsetup (renamed from src/test/citest/etc/workarounds.postsimsetup) | 5 | ||||
-rwxr-xr-x | src/test/framework/etc/workarounds.presimsetup (renamed from src/test/citest/etc/workarounds.presimsetup) | 2 | ||||
-rwxr-xr-x | src/test/framework/populate-sandbox (renamed from src/test/citest/populate-sandbox) | 7 | ||||
-rwxr-xr-x | src/test/framework/sbetest-start.sh (renamed from src/test/citest/sbetest-start.sh) | 4 | ||||
-rwxr-xr-x | src/test/framework/setup-env (renamed from src/test/citest/setup-env) | 4 | ||||
-rwxr-xr-x | src/test/testcases/ffdc.xml (renamed from src/test/ffdc.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/test.xml (renamed from src/test/test.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testAbort.py (renamed from src/test/testAbort.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem.xml (renamed from src/test/testAduMem.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem_ecc.py (renamed from src/test/testAduMem_ecc.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem_itag.py (renamed from src/test/testAduMem_itag.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem_noEccNoItag.py (renamed from src/test/testAduMem_noEccNoItag.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem_withEccItag.py (renamed from src/test/testAduMem_withEccItag.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testAduMem_withEccWithItagReadWrite.py (renamed from src/test/testAduMem_withEccWithItagReadWrite.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testCntlInstruction.py (renamed from src/test/testCntlInstruction.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testCntlInstruction.xml (renamed from src/test/testCntlInstruction.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testContinueMpipl.py (renamed from src/test/testContinueMpipl.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testContinueSbeBoot.py (renamed from src/test/testContinueSbeBoot.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testEnterMpipl.py (renamed from src/test/testEnterMpipl.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testExecutorMemory.py (renamed from src/test/testExecutorMemory.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testExecutorPSU.py (renamed from src/test/testExecutorPSU.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testExecutorPutRing.py (renamed from src/test/testExecutorPutRing.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testExecutorPutRing.xml (renamed from src/test/testExecutorPutRing.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testFifoReset.py (renamed from src/test/testFifoReset.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testFifoReset.xml (renamed from src/test/testFifoReset.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testGeneric.xml (renamed from src/test/testGeneric.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testGetCapabilities.py (renamed from src/test/testGetCapabilities.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testGetMem.py (renamed from src/test/testGetMem.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testGetMem_expdata.py (renamed from src/test/testGetMem_expdata.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testGetRing.py (renamed from src/test/testGetRing.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testGetRing.xml (renamed from src/test/testGetRing.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testIstep.xml (renamed from src/test/testIstep.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testIstepAuto.py (renamed from src/test/testIstepAuto.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testIstepInvalid.py (renamed from src/test/testIstepInvalid.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testIstepInvalidFenced.py (renamed from src/test/testIstepInvalidFenced.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testIstepSuccess.py (renamed from src/test/testIstepSuccess.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testModifyScom.py (renamed from src/test/testModifyScom.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testPSUUserUtil.py (renamed from src/test/testPSUUserUtil.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testPSUUtil.py (renamed from src/test/testPSUUtil.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutGetInScom.py (renamed from src/test/testPutGetInScom.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testPutGetMem.xml (renamed from src/test/testPutGetMem.xml) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutGetRegFpr.py (renamed from src/test/testPutGetRegFpr.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutGetRegGpr.py (renamed from src/test/testPutGetRegGpr.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutGetRegSpr.py (renamed from src/test/testPutGetRegSpr.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutGetScom.py (renamed from src/test/testPutGetScom.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testPutMem.py (renamed from src/test/testPutMem.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testPutMem_fail.py (renamed from src/test/testPutMem_fail.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testPutScomUnderMask.py (renamed from src/test/testPutScomUnderMask.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testRegAccess.xml (renamed from src/test/testRegAccess.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testRegistry.py (renamed from src/test/testRegistry.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testSbeDump.py (renamed from src/test/testSbeDump.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testScom.xml (renamed from src/test/testScom.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testSram.py (renamed from src/test/testSram.py) | 2 | ||||
-rwxr-xr-x | src/test/testcases/testSram.xml (renamed from src/test/testSram.xml) | 2 | ||||
-rw-r--r-- | src/test/testcases/testStartInstruction.py (renamed from src/test/testStartInstruction.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testStopInstruction.py (renamed from src/test/testStopInstruction.py) | 2 | ||||
-rw-r--r-- | src/test/testcases/testUtil.py (renamed from src/test/testUtil.py) | 2 | ||||
-rwxr-xr-x | src/tools/debug/hw-debug-framework.py (renamed from src/tools/debug/sbe-debug.py) | 2 | ||||
-rwxr-xr-x | src/tools/debug/simics-debug-framework.py (renamed from src/tools/debug/simics/simics-debug-framework.py) | 2 | ||||
-rwxr-xr-x | src/tools/debug/simics/sbe_standalone.simics | 2 | ||||
-rw-r--r-- | src/tools/image/Makefile | 24 | ||||
-rwxr-xr-x | src/tools/scripts/ppeSetFixed.pl | 3 | ||||
-rw-r--r-- | src/tools/trace/Makefile (renamed from src/tools/ppetracepp/Makefile) | 2 | ||||
-rw-r--r-- | src/tools/trace/cmvc/makefile (renamed from src/tools/ppetracepp/cmvc/makefile) | 2 | ||||
-rwxr-xr-x | src/tools/trace/jhash.h (renamed from src/tools/ppetracepp/jhash.h) | 2 | ||||
-rwxr-xr-x | src/tools/trace/ppe2fsp.c (renamed from src/tools/ppetracepp/ppe2fsp.c) | 2 | ||||
-rw-r--r-- | src/tools/trace/ppe2fsp.h (renamed from src/tools/ppetracepp/ppe2fsp.h) | 2 | ||||
-rw-r--r-- | src/tools/trace/ppe2fsp_cmd.c (renamed from src/tools/ppetracepp/ppe2fsp_cmd.c) | 2 | ||||
-rwxr-xr-x | src/tools/trace/ppetracepp.C (renamed from src/tools/ppetracepp/ppetracepp.C) | 2 | ||||
-rwxr-xr-x | src/tools/trace/trac_interface.h (renamed from src/tools/ppetracepp/trac_interface.h) | 2 | ||||
-rwxr-xr-x | src/tools/trace/tracehash.pl (renamed from src/tools/ppetracepp/tracehash.pl) | 2 | ||||
-rw-r--r-- | src/tools/utils/modules/gitUtil.pm (renamed from src/tools/utils/perl.modules/gitUtil.pm) | 2 | ||||
-rwxr-xr-x | src/tools/utils/sbeGitTool.pl | 3 |
101 files changed, 251 insertions, 161 deletions
@@ -30,7 +30,7 @@ if [ -e ./customrc ]; then fi export PATH=${PATH}:${SBEROOT}/import/chips/p9/xip/bin/ -export PATH=${PATH}:${SBEROOT}/src/tools/ppetracepp/ +export PATH=${PATH}:${SBEROOT}/src/tools/trace/ if [ -n "${SANDBOXROOT}" ]; then if [ -n "${SANDBOXNAME}" ]; then @@ -25,7 +25,7 @@ # IBM_PROLOG_END_TAG SBE_TOOLS_PATH="src/tools/utils" -SBE_CITEST_PATH="src/test/citest" +SBE_CITEST_PATH="src/test/framework" sb_helptext() { diff --git a/src/build/Makefile b/src/build/Makefile index 89473e73..23bae9e7 100644 --- a/src/build/Makefile +++ b/src/build/Makefile @@ -27,7 +27,8 @@ #Pull in the definitions that affect all makefiles for this image include img_defs.mk -include ../boot/bootfiles.mk +include $(BOOT_SRCDIR)/bootfiles.mk +include $(BUILDDATA_SRCDIR)/utils.mk #Pull in object file names for the top directory include topfiles.mk @@ -38,6 +39,7 @@ PKLIB := $(OBJDIR)/pk/libpk.a LLIBS += -lpk SUBDIRS += $(BOOT_SRCDIR) +SUBDIRS += $(BUILDDATA_SRCDIR) SUBDIRS += ../sbefw LIB_DIRS += -L$(OBJDIR)/sbefw @@ -102,22 +104,23 @@ LIB_DIRS += -L$(OBJDIR)/pm PMLIB := $(OBJDIR)/pm/libpm.a LLIBS += -lpm -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).out -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).map -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SBE_NAME).dis +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SBE_NAME).out +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SBE_NAME).map +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SBE_NAME).dis SIMICS_PPE_TAR_FILES += $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out SIMICS_PPE_TAR_FILES += $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).map SIMICS_PPE_TAR_FILES += $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).dis -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map -SIMICS_PPE_TAR_FILES += $(OBJDIR)/$(IMAGE_SEEPROM_NAME).dis +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).map +SIMICS_PPE_TAR_FILES += $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis SIMICS_PPE_TAR_FILES += $(IMG_DIR)/sbe.syms SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.xml SIMICS_PPE_TAR_FILES += $(TEST_SRCDIR)/*.py SIMICS_PPE_TAR_FILES += $(PPETRACEPP_DIR)/fsp-trace SIMICS_PPE_TAR_FILES += $(IMG_DIR)/sbeStringFile -SIMICS_PPE_TAR_FILES += $(OBJDIR)/ppe2fsp +SIMICS_PPE_TAR_FILES += $(PPETRACEPP_BIN_DIR)/ppe2fsp SIMICS_BB_TAR_FILES += $(SIMICSTOOLS_SRCDIR)/* +SIMICS_BB_TAR_FILES += $(DEBUGTOOLS_SRCDIR)/simics-debug-framework.py SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/cmvc/makefile SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.h SIMICS_PPETRACEPP_TAR_FILES += $(PPETRACEPP_DIR)/ppe2fsp.c @@ -127,7 +130,7 @@ SIMICS_PPETRACEPP_TAR_FILES += $(PK_SRCDIR)/trace/pk_trace.h SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/plugins/sbeUserDataParser.C SIMICS_PARSERPLUGINS_TAR_FILES += $(SBE_FW_DIR)/sbeFFDCType.H -SBE_TOOLS := $(BASE_OBJDIR)/sbe_default_tool +SBE_TOOLS := $(IMG_DIR)/sbe_default_tool P9_XIP_TOOL := $(P9_XIP_BINDIR)/p9_xip_tool @@ -137,45 +140,45 @@ LINK_OBJS = $(OBJS) OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS)) LINK_OBJS += $(OBJS) $(GCCLIBS) -LINK_SCRIPT_SEEPROM = $(addprefix $(OBJDIR)/, linkscriptseeprom) -LINK_SCRIPT_SBE = $(addprefix $(OBJDIR)/, linkscriptsbe) +LINK_SCRIPT_SEEPROM = $(addprefix $(OBJDIR)/build/linkerscripts, linkscriptseeprom) +LINK_SCRIPT_SBE = $(addprefix $(OBJDIR)/build/linkerscripts, linkscriptsbe) # ---- SEEPROM Image ------ # This removes all unecessary headers from the ELF executable -$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(OBJDIR)/$(IMAGE_SEEPROM_NAME).dis: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out +$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis: $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out ./parsAndCutElf.py - $(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_SEEPROM_NAME).dis + $(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis #create a linked ELF executable -$(OBJDIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM) - $(LD) -n -T$(LINK_SCRIPT_SEEPROM) -Map $(OBJDIR)/$(IMAGE_SEEPROM_NAME).map \ - -Bstatic -o $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(BOOT_OBJECTS) $(OBJS) $(LIB_DIRS) \ +$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM) + $(LD) -n -T$(LINK_SCRIPT_SEEPROM) -Map $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).map \ + -Bstatic -o $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(BOOT_OBJECTS) $(BUILDDATA_OBJDIR)/base_ppe_header.o $(OBJS) $(LIB_DIRS) \ --start-group $(LLIBS) --end-group -leabi -lmath -lc # pass the link command file through the C preprocessor to evaluate macros # and remove comments $(LINK_SCRIPT_SEEPROM): $(LINKER_DIR)/linkseeprom.cmd - $(CPP) -I. -E -x c++ -P $(DEFS) $(LINKER_DIR)/linkseeprom.cmd -o $(LINK_SCRIPT_SEEPROM) + $(CPP) -I $(INCLUDES) -E -x c++ -P $(DEFS) $(LINKER_DIR)/linkseeprom.cmd -o $(LINK_SCRIPT_SEEPROM) # ---- PIBMEM Image ------ #This removes all unecessary headers from the ELF executable -$(IMG_DIR)/$(IMAGE_SBE_NAME).bin $(OBJDIR)/$(IMAGE_SBE_NAME).dis: $(OBJDIR)/$(IMAGE_SBE_NAME).out +$(IMG_DIR)/$(IMAGE_SBE_NAME).bin $(IMG_DIR)/$(IMAGE_SBE_NAME).dis: $(IMG_DIR)/$(IMAGE_SBE_NAME).out $(OBJCOPY) -O binary $< $(IMG_DIR)/$(IMAGE_SBE_NAME).bin --pad-to \ - 0x`/usr/bin/nm $(OBJDIR)/$(IMAGE_SBE_NAME).out | grep "A _sbe_end" \ + 0x`/usr/bin/nm $(IMG_DIR)/$(IMAGE_SBE_NAME).out | grep "A _sbe_end" \ | cut -d " " -f 1` - $(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_SBE_NAME).dis + $(OBJDUMP) -S $< > $(IMG_DIR)/$(IMAGE_SBE_NAME).dis $(NM) $< > $(IMG_DIR)/$(IMAGE_SBE_NAME).syms # create a linked ELF executable -$(OBJDIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin buildInfo $(OBJDIR)/base_sbe_fixed.o $(SUBDIRS) $(LINK_OBJS) $(LINK_SCRIPT_SBE) - $(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(OBJDIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) --end-group +$(IMG_DIR)/$(IMAGE_SBE_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) $(LINK_OBJS) $(LINK_SCRIPT_SBE) + $(LD) -e __system_reset -T$(LINK_SCRIPT_SBE) -Map $(IMG_DIR)/$(IMAGE_SBE_NAME).map -Bstatic -o $(IMG_DIR)/$(IMAGE_SBE_NAME).out $(LIB_DIRS) $(BUILDDATA_OBJDIR)/base_sbe_fixed.o --start-group $(LLIBS) --end-group # pass the link command file through the C preprocessor to evaluate macros and remove comments $(LINK_SCRIPT_SBE): $(LINKER_DIR)/linksbe.cmd - $(CPP) -E -x c++ -I. -P $(DEFS) $(LINKER_DIR)/linksbe.cmd -o $(LINK_SCRIPT_SBE) + $(CPP) -E -x c++ -I $(INCLUDES) -P $(DEFS) $(LINKER_DIR)/linksbe.cmd -o $(LINK_SCRIPT_SBE) -all: $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SBE_NAME).bin \ - $(SBE_TOOLS) normalize defaultset $(OBJDIR)/fixed.bin appendloader \ +all: $(OBJDIR) xml $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SBE_NAME).bin \ + $(SBE_TOOLS) normalize defaultset $(IMG_DIR)/fixed.bin appendloader \ appendoverrides add_LoaderAddr symbols tracehash buildinfo report install: all @@ -188,9 +191,9 @@ install: all @cp $(SIMICS_BB_TAR_FILES) $(OBJDIR)/simics-tar-dir @cp $(SIMICS_PPETRACEPP_TAR_FILES) $(OBJDIR)/simics-tar-dir/ppetracepp @cp $(SIMICS_PARSERPLUGINS_TAR_FILES) $(OBJDIR)/simics-tar-dir/parserplugins - @cd $(OBJDIR)/simics-tar-dir && tar -cvf simics.tar * && mv simics.tar $(OBJDIR) && cd .. + @cd $(OBJDIR)/simics-tar-dir && tar -cvf simics.tar * && mv simics.tar $(IMG_DIR) && cd .. @rm -rf $(OBJDIR)/simics-tar-dir - @echo "Generated simics.tar in Sbe Obj Directory" + @echo "Generated simics.tar in Sbe images Directory" .PHONY: all normalize defaultset appendloader add_LoaderAddr symbols report \ appendoverrides xml tracehash topfixedheaders $(SUBDIRS) @@ -201,13 +204,13 @@ buildinfo: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set build_user `id -un` $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set build_host `hostname` -add_LoaderAddr: $(P9_XIP_TOOL) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out - $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set L1_LoaderAddr 0x`nm $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out | grep __pmLoader | cut -f 1 -d " "` +add_LoaderAddr: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out + $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set L1_LoaderAddr 0x`nm $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out | grep __pmLoader | cut -f 1 -d " "` $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set L2_LoaderAddr 0x`nm $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out | grep __base_loader_setup | cut -f 1 -d " "` - $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set kernelAddr 0x`nm $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out | grep __pk_boot | cut -f 1 -d " "` + $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin set kernelAddr 0x`nm $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out | grep __pk_boot | cut -f 1 -d " "` -symbols: $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out $(OBJDIR)/$(IMAGE_SBE_NAME).out - $(NM) $(OBJDIR)/$(IMAGE_SEEPROM_NAME).out > $(IMG_DIR)/$(SBE_SYMBOLS_NAME) +symbols: $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out $(IMG_DIR)/$(IMAGE_SBE_NAME).out + $(NM) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out > $(IMG_DIR)/$(SBE_SYMBOLS_NAME) $(NM) $(BOOT_OBJDIR)/$(IMAGE_LOADER_NAME).out >> $(IMG_DIR)/$(SBE_SYMBOLS_NAME) report: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin @@ -219,7 +222,7 @@ buildInfo: #Create an obj directory if needed -$(LINK_OBJS) $(OBJS) $(OBJS:.o=.d) $(OBJDIR)/base_sbe_fixed.o $(OBJDIR)/base_sbe_fixed.d: | $(OBJDIR) +$(LINK_OBJS) $(OBJS) $(OBJS:.o=.d) ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/pervasive_attributes.xml # TODO via RTC 142708 @@ -235,12 +238,13 @@ ATTRFILES += $(BASE_FAPI2_DIR)/xml/attribute_info/chip_attributes.xml ATTRFILES += $(IMPORT_XML_DIR)/attribute_info/chip_ec_attributes.xml $(OBJDIR): + mkdir -p $(OBJDIR) + mkdir -p $(IMG_DIR) + mkdir -p $(OBJDIR)/genfiles $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) $(TOOLS_ATTR_DIR)/ppeParseAttributeInfo.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) $(TOOLS_ATTR_DIR)/ppeCreateAttrGetSetMacros.pl --path $(TOOLS_ATTR_DIR)/src --inc $(PLAT_FAPI2_DIR)/include --src $(PLAT_FAPI2_DIR)/src $(TOOLS_ATTR_DIR)/ppeCreateIfAttrService.pl $(PLAT_FAPI2_DIR)/include $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) - mkdir -p $(OBJDIR) - mkdir -p $(IMG_DIR) topfixedheaders: $(TOOLS_ATTR_DIR)/ppeParseProcSbeFixed.pl . $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) @@ -258,26 +262,27 @@ attrserv: # Build the subdirectories $(SUBDIRS): - $(MAKE) -I $(BUILD_DIR) -C $@ -f Makefile + $(MAKE) -I $(INCLUDES) -C $@ -f Makefile #Build the SBE XIP Tools $(SBE_TOOLS): $(P9_XIP_TOOL) - $(MAKE) -I $(BUILD_DIR) -C $(TOOLS_IMAGE_DIR) -f Makefile + $(MAKE) -I $(INCLUDES) -C $(TOOLS_IMAGE_DIR) -f Makefile # Build the P9-XIP Tool $(P9_XIP_TOOL): $(MAKE) -I $(P9_XIP_SRCDIR) -C $(P9_XIP_SRCDIR) -f Makefile BINDIR=$(P9_XIP_BINDIR) + cp $(P9_XIP_TOOL) $(IMG_DIR)/ normalize: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin normalize -defaultset: $(SBE_TOOLS) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin normalize - $(TOOLS_ATTR_DIR)/ppeSetFixed.pl $(BASE_OBJDIR) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) +defaultset:$(SBE_TOOLS) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin normalize + $(TOOLS_ATTR_DIR)/ppeSetFixed.pl $(IMG_DIR) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMPORT_XML_DIR)/attribute_info/p9_sbe_attributes.xml $(ATTRFILES) # Build the trace utilities ppe_trace_bin: - $(MAKE) -I $(BUILD_DIR) -C $(PPETRACEPP_DIR) -f Makefile #$(PK trace util) + $(MAKE) -I $(INCLUDES) -C $(PPETRACEPP_DIR) -f Makefile #$(PK trace util) # Build hwp_error_info.H. If the script fails then print the contents of @@ -290,8 +295,8 @@ xml: $(FAPI_RC) $(FAPI_RC): $(TOOLS_ATTR_DIR)/parseErrorInfo.pl $(ERROR_XML_FILES) $(TOOLS_ATTR_DIR)/parseErrorInfo.pl --local-ffdc --output-dir=. $(ERROR_XML_FILES) -$(OBJDIR)/fixed.bin: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin - $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin extract .fixed $(BASE_OBJDIR)/fixed.bin +$(IMG_DIR)/fixed.bin: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin + $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin extract .fixed $(IMG_DIR)/fixed.bin appendloader: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_LOADER_NAME).bin diff --git a/src/build/buildInfo.py b/src/build/buildInfo.py index f7b109e4..4350e682 100755 --- a/src/build/buildInfo.py +++ b/src/build/buildInfo.py @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,7 +27,7 @@ # This script will create header file sbe_build_info.H which will have # buld information required by SBE code. import os -buildInfoFileName = "sbe_build_info.H" +buildInfoFileName = "../../obj/genfiles/sbe_build_info.H" def buildInfo(): header = \ diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk index 8d7b4184..b14ca419 100644 --- a/src/build/img_defs.mk +++ b/src/build/img_defs.mk @@ -83,6 +83,10 @@ ifndef BUILD_DIR export BUILD_DIR = $(SBE_SRC_DIR)/build endif +ifndef BUILDDATA_SRCDIR +export BUILDDATA_SRCDIR = $(BUILD_DIR)/utils +endif + ifndef LINKER_DIR export LINKER_DIR = $(BUILD_DIR)/linkerscripts endif @@ -100,7 +104,7 @@ export TOOLS_SRCDIR = $(SBE_SRC_DIR)/tools endif ifndef TEST_SRCDIR -export TEST_SRCDIR = $(SBE_SRC_DIR)/test +export TEST_SRCDIR = $(SBE_SRC_DIR)/test/testcases endif ifndef DEBUGTOOLS_SRCDIR @@ -171,6 +175,10 @@ ifndef BOOT_OBJDIR export BOOT_OBJDIR = $(BASE_OBJDIR)/boot endif +ifndef BUILDDATA_OBJDIR +export BUILDDATA_OBJDIR = $(BASE_OBJDIR)/build/utils +endif + ifndef IMG_DIR export IMG_DIR = $(SBE_ROOT_DIR)/images endif @@ -201,11 +209,15 @@ export IMPORT_COMMON_DIR = $(IMPORT_SRCDIR)/chips/p9/common endif ifndef PPETRACEPP_DIR -export PPETRACEPP_DIR = $(TOOLS_SRCDIR)/ppetracepp +export PPETRACEPP_DIR = $(TOOLS_SRCDIR)/trace endif ifndef PPETRACEPP_BIN_DIR -export PPETRACEPP_BIN_DIR = $(BASE_OBJDIR) +export PPETRACEPP_BIN_DIR = $(IMG_DIR) +endif + +ifndef GENFILES_DIR +export GENFILES_DIR = $(BASE_OBJDIR)/genfiles endif ifndef PLAT_FAPI2_DIR @@ -358,6 +370,8 @@ INCLUDES += -I$(PK_SRCDIR)/ppe INCLUDES += -I$(PK_SRCDIR)/ppe42 INCLUDES += -I$(SBE_FW_DIR) INCLUDES += -I$(BOOT_SRCDIR) +INCLUDES += -I$(GENFILES_DIR) +INCLUDES += -I$(BUILDDATA_SRCDIR) INCLUDES += -I$(PK_SRCDIR)/trace INCLUDES += -I$(PPETRACEPP_DIR) INCLUDES += -I$(IMPORT_COMMON_DIR)/include diff --git a/src/build/linkerscripts/linkloader.cmd b/src/build/linkerscripts/linkloader.cmd index 75c460d4..1e2a20e3 100755 --- a/src/build/linkerscripts/linkloader.cmd +++ b/src/build/linkerscripts/linkloader.cmd @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -28,7 +29,7 @@ #ifndef BASE_LOADER_STACK_SIZE #define BASE_LOADER_STACK_SIZE 128 #endif -#include "../sbe_link.H" +#include "sbe_link.H" OUTPUT_FORMAT(elf32-powerpc); diff --git a/src/build/linkerscripts/linksbe.cmd b/src/build/linkerscripts/linksbe.cmd index 4e1832f6..12250a9d 100644 --- a/src/build/linkerscripts/linksbe.cmd +++ b/src/build/linkerscripts/linksbe.cmd @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -28,7 +29,7 @@ #ifndef INITIAL_STACK_SIZE #define INITIAL_STACK_SIZE 256 #endif -#include <sbe_link.H> +#include "sbe_link.H" OUTPUT_FORMAT(elf32-powerpc); diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd index 7cbbcda4..fd1b1474 100644 --- a/src/build/linkerscripts/linkseeprom.cmd +++ b/src/build/linkerscripts/linkseeprom.cmd @@ -6,6 +6,7 @@ /* OpenPOWER sbe Project */ /* */ /* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -23,7 +24,7 @@ /* IBM_PROLOG_END_TAG */ // Need to do this so that elf32-powerpc is not modified! #undef powerpc -#include <sbe_link.H> +#include "sbe_link.H" OUTPUT_FORMAT(elf32-powerpc); #ifndef INITIAL_STACK_SIZE diff --git a/src/build/parsAndCutElf.py b/src/build/parsAndCutElf.py index 934ddf97..acfe64a5 100755 --- a/src/build/parsAndCutElf.py +++ b/src/build/parsAndCutElf.py @@ -31,9 +31,9 @@ import sys # Workaround to cut SBE image from elf image. def parserElf(): - cmd = "readelf -S ../../obj/sbe_seeprom.out" + cmd = "readelf -S ../../images/sbe_seeprom.out" firstSection = ".header" - cmd1 = "nm ../../obj/sbe_seeprom.out | grep _sbe_image_size" + cmd1 = "nm ../../images/sbe_seeprom.out | grep _sbe_image_size" output = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE) i = 0; for line in output.stdout: @@ -60,7 +60,7 @@ def parserElf(): exit(-1) # cut the image - cmd1 = "dd skip=" + str(startSize) + " count=" + str(endSize) + " if=../../obj/sbe_seeprom.out of=../../images/sbe_seeprom.bin bs=1" + cmd1 = "dd skip=" + str(startSize) + " count=" + str(endSize) + " if=../../images/sbe_seeprom.out of=../../images/sbe_seeprom.bin bs=1" rc = os.system(cmd1) if ( rc ): print "ERROR running %s: %d "%( cmd1, rc ) diff --git a/src/build/topfiles.mk b/src/build/topfiles.mk index 6c76eaaf..71732138 100644 --- a/src/build/topfiles.mk +++ b/src/build/topfiles.mk @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +24,7 @@ # IBM_PROLOG_END_TAG TOP-C-SOURCES = TOP-CPP-SOURCES = -TOP-S-SOURCES = base_ppe_header.S +TOP-S-SOURCES = # generated by ppeParseProcSbeFixed.pl TOP-FIXED-HEADERS += $(BUILD_DIR)/proc_sbe_fixed_system.H diff --git a/src/build/utils/Makefile b/src/build/utils/Makefile new file mode 100644 index 00000000..163984cf --- /dev/null +++ b/src/build/utils/Makefile @@ -0,0 +1,43 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/build/utils/Makefile $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +export SUB_OBJDIR = /build/utils + +include img_defs.mk +include utils.mk + +OBJS := $(addprefix $(OBJDIR)/, $(BUILDDATA_OBJECTS)) +BUILDDATA_OBJECTS := $(OBJS) + +.PHONY: clean all + +all:$(OBJS) + +$(OBJS) $(OBJS:.o=.d): | $(OBJDIR) + +$(OBJDIR): + mkdir -p $(OBJDIR) + +clean: + rm -rf $(OBJDIR) diff --git a/src/build/base_ppe_header.S b/src/build/utils/base_ppe_header.S index b68b9214..c99cc08f 100644 --- a/src/build/base_ppe_header.S +++ b/src/build/utils/base_ppe_header.S @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/base_ppe_header.S $ */ +/* $Source: src/build/utils/base_ppe_header.S $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/base_sbe_fixed.S b/src/build/utils/base_sbe_fixed.S index e1a53f84..7474a38b 100644 --- a/src/build/base_sbe_fixed.S +++ b/src/build/utils/base_sbe_fixed.S @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/base_sbe_fixed.S $ */ +/* $Source: src/build/utils/base_sbe_fixed.S $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/p9_sbe.H b/src/build/utils/p9_sbe.H index 3e624d01..36c281eb 100644 --- a/src/build/p9_sbe.H +++ b/src/build/utils/p9_sbe.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/p9_sbe.H $ */ +/* $Source: src/build/utils/p9_sbe.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/proc_sbe_fixed.H b/src/build/utils/proc_sbe_fixed.H index 6c3d134e..9b06fb6f 100644 --- a/src/build/proc_sbe_fixed.H +++ b/src/build/utils/proc_sbe_fixed.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/proc_sbe_fixed.H $ */ +/* $Source: src/build/utils/proc_sbe_fixed.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/sbe_common.H b/src/build/utils/sbe_common.H index 4fb78079..3cd8a0a0 100644 --- a/src/build/sbe_common.H +++ b/src/build/utils/sbe_common.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/sbe_common.H $ */ +/* $Source: src/build/utils/sbe_common.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/sbe_link.H b/src/build/utils/sbe_link.H index ad703e1a..0321a0a8 100644 --- a/src/build/sbe_link.H +++ b/src/build/utils/sbe_link.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/build/sbe_link.H $ */ +/* $Source: src/build/utils/sbe_link.H $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/build/utils/utils.mk b/src/build/utils/utils.mk new file mode 100644 index 00000000..e1fed401 --- /dev/null +++ b/src/build/utils/utils.mk @@ -0,0 +1,27 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/build/utils/utils.mk $ +# +# OpenPOWER sbe Project +# +# Contributors Listed Below - COPYRIGHT 2015,2016 +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +BUILDDATA-S-SOURCES = base_ppe_header.S +BUILDDATA-S-SOURCES += base_sbe_fixed.S + +BUILDDATA_OBJECTS += $(BUILDDATA-S-SOURCES:.S=.o) diff --git a/src/test/citest/autocitest b/src/test/framework/autocitest index 088bb58b..3b7332b2 100755 --- a/src/test/citest/autocitest +++ b/src/test/framework/autocitest @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/autocitest $ +# $Source: src/test/framework/autocitest $ # # OpenPOWER sbe Project # diff --git a/src/test/citest/build-script b/src/test/framework/build-script index 5ad6b1bd..486a0ac9 100755 --- a/src/test/citest/build-script +++ b/src/test/framework/build-script @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/build-script $ +# $Source: src/test/framework/build-script $ # # OpenPOWER sbe Project # @@ -31,7 +31,7 @@ if [ -z $SBEROOT ]; then source "$WORKSPACE/env.bash" fi -source "$SBEROOT/src/test/citest/setup-env" +source "$SBEROOT/src/test/framework/setup-env" # Check copyright. #check-copyright > copyright.log 2>&1 & diff --git a/src/test/citest/check-copyright b/src/test/framework/check-copyright index 28db5512..bd893b39 100755 --- a/src/test/citest/check-copyright +++ b/src/test/framework/check-copyright @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/check-copyright $ +# $Source: src/test/framework/check-copyright $ # # OpenPOWER sbe Project # @@ -23,7 +23,7 @@ # # IBM_PROLOG_END_TAG -COPYRIGHT_CHECK=${SBEROOT}/src/test/citest/copyright-check.sh +COPYRIGHT_CHECK=${SBEROOT}/src/test/framework/copyright-check.sh COMMIT_CHECK=${SBEROOT}/src/tools/hooks/verify-commit $COPYRIGHT_CHECK || exit -1 diff --git a/src/test/citest/copyright-check.sh b/src/test/framework/copyright-check.sh index 3d7c5d54..ec305360 100755 --- a/src/test/citest/copyright-check.sh +++ b/src/test/framework/copyright-check.sh @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/copyright-check.sh $ +# $Source: src/test/framework/copyright-check.sh $ # # OpenPOWER sbe Project # diff --git a/src/test/citest/create-sandbox b/src/test/framework/create-sandbox index b6a1e7e8..add0a78b 100755 --- a/src/test/citest/create-sandbox +++ b/src/test/framework/create-sandbox @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/create-sandbox $ +# $Source: src/test/framework/create-sandbox $ # # OpenPOWER sbe Project # diff --git a/src/test/citest/etc/patches/chip.act.patch b/src/test/framework/etc/patches/chip.act.patch index 0b9cf0f0..0b9cf0f0 100644 --- a/src/test/citest/etc/patches/chip.act.patch +++ b/src/test/framework/etc/patches/chip.act.patch diff --git a/src/test/citest/etc/patches/patchlist.txt b/src/test/framework/etc/patches/patchlist.txt index 4fd0444a..4fd0444a 100644 --- a/src/test/citest/etc/patches/patchlist.txt +++ b/src/test/framework/etc/patches/patchlist.txt diff --git a/src/test/citest/etc/patches/pervasive.act.patch b/src/test/framework/etc/patches/pervasive.act.patch index 5531bef6..5531bef6 100644 --- a/src/test/citest/etc/patches/pervasive.act.patch +++ b/src/test/framework/etc/patches/pervasive.act.patch diff --git a/src/test/citest/etc/patches/powermgmt.act.patch b/src/test/framework/etc/patches/powermgmt.act.patch index efb03845..efb03845 100644 --- a/src/test/citest/etc/patches/powermgmt.act.patch +++ b/src/test/framework/etc/patches/powermgmt.act.patch diff --git a/src/test/citest/etc/patches/standalone.simics.patch b/src/test/framework/etc/patches/standalone.simics.patch index bdc40fd8..bdc40fd8 100644 --- a/src/test/citest/etc/patches/standalone.simics.patch +++ b/src/test/framework/etc/patches/standalone.simics.patch diff --git a/src/test/citest/etc/workarounds.postsimsetup b/src/test/framework/etc/workarounds.postsimsetup index 057c3b00..ac7f3a29 100755 --- a/src/test/citest/etc/workarounds.postsimsetup +++ b/src/test/framework/etc/workarounds.postsimsetup @@ -2,11 +2,12 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/etc/workarounds.postsimsetup $ +# $Source: src/test/framework/etc/workarounds.postsimsetup $ # # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -39,5 +40,5 @@ echo "+++ Patching standalone.simics" mkdir -p $SANDBOXBASE/obj/ppc/simu/scripts/hbfw cp $BACKING_BUILD/obj/ppc/simu/scripts/hbfw/standalone.simics $SANDBOXBASE/obj/ppc/simu/scripts/hbfw -patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/src/test/citest/etc/patches/standalone.simics.patch +patch -p0 $SANDBOXBASE/obj/ppc/simu/scripts/hbfw/standalone.simics $SBEROOT/src/test/framework/etc/patches/standalone.simics.patch diff --git a/src/test/citest/etc/workarounds.presimsetup b/src/test/framework/etc/workarounds.presimsetup index 638a1e84..e863b07d 100755 --- a/src/test/citest/etc/workarounds.presimsetup +++ b/src/test/framework/etc/workarounds.presimsetup @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/etc/workarounds.presimsetup $ +# $Source: src/test/framework/etc/workarounds.presimsetup $ # # OpenPOWER sbe Project # diff --git a/src/test/citest/populate-sandbox b/src/test/framework/populate-sandbox index 488462b1..729b61fa 100755 --- a/src/test/citest/populate-sandbox +++ b/src/test/framework/populate-sandbox @@ -2,12 +2,11 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/populate-sandbox $ +# $Source: src/test/framework/populate-sandbox $ # # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 -# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -45,7 +44,7 @@ mkdir -p $SBEFW_IMG_DIR || exit -1 # Copy sbe binaries cp $SBEROOT/images/*.bin $SBEFW_IMG_DIR/ || exit -1 -cp $SBEROOT/obj/simics.tar $SBEFW_DIR/ || exit -1 +cp $SBEROOT/images/simics.tar $SBEFW_DIR/ || exit -1 # Compile sbe code in sandbox to copy binaries at right place echo "---Setup sandbox for sbe binaries." @@ -57,5 +56,5 @@ execute_in_sandbox "cd $SBEFW_DIR; mk install_all" \ # Copy test files. -cp -r $SBEROOT/src/test/* $SBETESTDIR/ || exit -1 +cp -r $SBEROOT/src/test/testcases/* $SBETESTDIR/ || exit -1 diff --git a/src/test/citest/sbetest-start.sh b/src/test/framework/sbetest-start.sh index f39ed84e..a0d7f27a 100755 --- a/src/test/citest/sbetest-start.sh +++ b/src/test/framework/sbetest-start.sh @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/sbetest-start.sh $ +# $Source: src/test/framework/sbetest-start.sh $ # # OpenPOWER sbe Project # @@ -26,7 +26,7 @@ if [ -z $SBE_CI_ENV_SETUP ]; then unset $SANDBOXBASE unset $SANDBOXNAME - source "$SBEROOT/src/test/citest/setup-env" + source "$SBEROOT/src/test/framework/setup-env" fi # Front end to autocitest - script to execute unit tests under simics. diff --git a/src/test/citest/setup-env b/src/test/framework/setup-env index ee0bc18b..6de2d8fd 100755 --- a/src/test/citest/setup-env +++ b/src/test/framework/setup-env @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/citest/setup-env $ +# $Source: src/test/framework/setup-env $ # # OpenPOWER sbe Project # @@ -23,7 +23,7 @@ # # IBM_PROLOG_END_TAG -export CITESTPATH=${SBEROOT}/src/test/citest +export CITESTPATH=${SBEROOT}/src/test/framework export PATH=${CITESTPATH}:${PATH} # If we are running under Jenkins we need to pick a random-ish sandbox name diff --git a/src/test/ffdc.xml b/src/test/testcases/ffdc.xml index 65364249..b8773556 100755 --- a/src/test/ffdc.xml +++ b/src/test/testcases/ffdc.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/ffdc.xml $ --> +<!-- $Source: src/test/testcases/ffdc.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/test.xml b/src/test/testcases/test.xml index 2172b8f6..240ec318 100755 --- a/src/test/test.xml +++ b/src/test/testcases/test.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/test.xml $ --> +<!-- $Source: src/test/testcases/test.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testAbort.py b/src/test/testcases/testAbort.py index 7039c70b..c8be29bf 100755 --- a/src/test/testAbort.py +++ b/src/test/testcases/testAbort.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAbort.py $ +# $Source: src/test/testcases/testAbort.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testAduMem.xml b/src/test/testcases/testAduMem.xml index 1fcbe12d..fe3194d7 100644 --- a/src/test/testAduMem.xml +++ b/src/test/testcases/testAduMem.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testAduMem.xml $ --> +<!-- $Source: src/test/testcases/testAduMem.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testAduMem_ecc.py b/src/test/testcases/testAduMem_ecc.py index f60af64e..9741d1cb 100644 --- a/src/test/testAduMem_ecc.py +++ b/src/test/testcases/testAduMem_ecc.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAduMem_ecc.py $ +# $Source: src/test/testcases/testAduMem_ecc.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testAduMem_itag.py b/src/test/testcases/testAduMem_itag.py index 8c7d9a3c..33a594ab 100644 --- a/src/test/testAduMem_itag.py +++ b/src/test/testcases/testAduMem_itag.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAduMem_itag.py $ +# $Source: src/test/testcases/testAduMem_itag.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testAduMem_noEccNoItag.py b/src/test/testcases/testAduMem_noEccNoItag.py index ccbad942..354ad8bd 100644 --- a/src/test/testAduMem_noEccNoItag.py +++ b/src/test/testcases/testAduMem_noEccNoItag.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAduMem_noEccNoItag.py $ +# $Source: src/test/testcases/testAduMem_noEccNoItag.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testAduMem_withEccItag.py b/src/test/testcases/testAduMem_withEccItag.py index 7db53813..d3c9f9c0 100644 --- a/src/test/testAduMem_withEccItag.py +++ b/src/test/testcases/testAduMem_withEccItag.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAduMem_withEccItag.py $ +# $Source: src/test/testcases/testAduMem_withEccItag.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testAduMem_withEccWithItagReadWrite.py b/src/test/testcases/testAduMem_withEccWithItagReadWrite.py index 95578979..3d294915 100644 --- a/src/test/testAduMem_withEccWithItagReadWrite.py +++ b/src/test/testcases/testAduMem_withEccWithItagReadWrite.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testAduMem_withEccWithItagReadWrite.py $ +# $Source: src/test/testcases/testAduMem_withEccWithItagReadWrite.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testCntlInstruction.py b/src/test/testcases/testCntlInstruction.py index 125b1b67..f3143e70 100644 --- a/src/test/testCntlInstruction.py +++ b/src/test/testcases/testCntlInstruction.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testCntlInstruction.py $ +# $Source: src/test/testcases/testCntlInstruction.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testCntlInstruction.xml b/src/test/testcases/testCntlInstruction.xml index 07e22ee3..ef16cd40 100755 --- a/src/test/testCntlInstruction.xml +++ b/src/test/testcases/testCntlInstruction.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testCntlInstruction.xml $ --> +<!-- $Source: src/test/testcases/testCntlInstruction.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testContinueMpipl.py b/src/test/testcases/testContinueMpipl.py index 080e479a..17f9f7fa 100755 --- a/src/test/testContinueMpipl.py +++ b/src/test/testcases/testContinueMpipl.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testContinueMpipl.py $ +# $Source: src/test/testcases/testContinueMpipl.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testContinueSbeBoot.py b/src/test/testcases/testContinueSbeBoot.py index 5f64f0fa..f3542eda 100755 --- a/src/test/testContinueSbeBoot.py +++ b/src/test/testcases/testContinueSbeBoot.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testContinueSbeBoot.py $ +# $Source: src/test/testcases/testContinueSbeBoot.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testEnterMpipl.py b/src/test/testcases/testEnterMpipl.py index 8d225831..ce99c81b 100755 --- a/src/test/testEnterMpipl.py +++ b/src/test/testcases/testEnterMpipl.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testEnterMpipl.py $ +# $Source: src/test/testcases/testEnterMpipl.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testExecutorMemory.py b/src/test/testcases/testExecutorMemory.py index 125528bf..fe1b8526 100644 --- a/src/test/testExecutorMemory.py +++ b/src/test/testcases/testExecutorMemory.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testExecutorMemory.py $ +# $Source: src/test/testcases/testExecutorMemory.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testExecutorPSU.py b/src/test/testcases/testExecutorPSU.py index 5c58a954..0b5d83d1 100644 --- a/src/test/testExecutorPSU.py +++ b/src/test/testcases/testExecutorPSU.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testExecutorPSU.py $ +# $Source: src/test/testcases/testExecutorPSU.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testExecutorPutRing.py b/src/test/testcases/testExecutorPutRing.py index d6c74bb8..59949a9f 100644 --- a/src/test/testExecutorPutRing.py +++ b/src/test/testcases/testExecutorPutRing.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testExecutorPutRing.py $ +# $Source: src/test/testcases/testExecutorPutRing.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testExecutorPutRing.xml b/src/test/testcases/testExecutorPutRing.xml index 56aabc0c..833484a8 100755 --- a/src/test/testExecutorPutRing.xml +++ b/src/test/testcases/testExecutorPutRing.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testExecutorPutRing.xml $ --> +<!-- $Source: src/test/testcases/testExecutorPutRing.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testFifoReset.py b/src/test/testcases/testFifoReset.py index 3b03e6c6..41eb6563 100644 --- a/src/test/testFifoReset.py +++ b/src/test/testcases/testFifoReset.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testFifoReset.py $ +# $Source: src/test/testcases/testFifoReset.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testFifoReset.xml b/src/test/testcases/testFifoReset.xml index 48b12a3e..b9ef674d 100644 --- a/src/test/testFifoReset.xml +++ b/src/test/testcases/testFifoReset.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testFifoReset.xml $ --> +<!-- $Source: src/test/testcases/testFifoReset.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testGeneric.xml b/src/test/testcases/testGeneric.xml index cc49a78b..85ce990a 100755 --- a/src/test/testGeneric.xml +++ b/src/test/testcases/testGeneric.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testGeneric.xml $ --> +<!-- $Source: src/test/testcases/testGeneric.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testGetCapabilities.py b/src/test/testcases/testGetCapabilities.py index e6831352..4a61d761 100755 --- a/src/test/testGetCapabilities.py +++ b/src/test/testcases/testGetCapabilities.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testGetCapabilities.py $ +# $Source: src/test/testcases/testGetCapabilities.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testGetMem.py b/src/test/testcases/testGetMem.py index a927f250..baf3b353 100644 --- a/src/test/testGetMem.py +++ b/src/test/testcases/testGetMem.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testGetMem.py $ +# $Source: src/test/testcases/testGetMem.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testGetMem_expdata.py b/src/test/testcases/testGetMem_expdata.py index 56b43119..df0b51f6 100644 --- a/src/test/testGetMem_expdata.py +++ b/src/test/testcases/testGetMem_expdata.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testGetMem_expdata.py $ +# $Source: src/test/testcases/testGetMem_expdata.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testGetRing.py b/src/test/testcases/testGetRing.py index d6d786b8..61fba66e 100644 --- a/src/test/testGetRing.py +++ b/src/test/testcases/testGetRing.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testGetRing.py $ +# $Source: src/test/testcases/testGetRing.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testGetRing.xml b/src/test/testcases/testGetRing.xml index a30802c2..808b2012 100755 --- a/src/test/testGetRing.xml +++ b/src/test/testcases/testGetRing.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testGetRing.xml $ --> +<!-- $Source: src/test/testcases/testGetRing.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testIstep.xml b/src/test/testcases/testIstep.xml index f0e71d61..70cf2a62 100644 --- a/src/test/testIstep.xml +++ b/src/test/testcases/testIstep.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testIstep.xml $ --> +<!-- $Source: src/test/testcases/testIstep.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testIstepAuto.py b/src/test/testcases/testIstepAuto.py index 8cbccffa..bb1fcb5f 100755 --- a/src/test/testIstepAuto.py +++ b/src/test/testcases/testIstepAuto.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testIstepAuto.py $ +# $Source: src/test/testcases/testIstepAuto.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testIstepInvalid.py b/src/test/testcases/testIstepInvalid.py index 5af909d7..cd26b209 100755 --- a/src/test/testIstepInvalid.py +++ b/src/test/testcases/testIstepInvalid.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testIstepInvalid.py $ +# $Source: src/test/testcases/testIstepInvalid.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testIstepInvalidFenced.py b/src/test/testcases/testIstepInvalidFenced.py index 568253af..f64074b8 100755 --- a/src/test/testIstepInvalidFenced.py +++ b/src/test/testcases/testIstepInvalidFenced.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testIstepInvalidFenced.py $ +# $Source: src/test/testcases/testIstepInvalidFenced.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testIstepSuccess.py b/src/test/testcases/testIstepSuccess.py index 83871896..f9e18436 100755 --- a/src/test/testIstepSuccess.py +++ b/src/test/testcases/testIstepSuccess.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testIstepSuccess.py $ +# $Source: src/test/testcases/testIstepSuccess.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testModifyScom.py b/src/test/testcases/testModifyScom.py index 703ad680..36d75aca 100755 --- a/src/test/testModifyScom.py +++ b/src/test/testcases/testModifyScom.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testModifyScom.py $ +# $Source: src/test/testcases/testModifyScom.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPSUUserUtil.py b/src/test/testcases/testPSUUserUtil.py index df586ab7..383cb97c 100644 --- a/src/test/testPSUUserUtil.py +++ b/src/test/testcases/testPSUUserUtil.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPSUUserUtil.py $ +# $Source: src/test/testcases/testPSUUserUtil.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPSUUtil.py b/src/test/testcases/testPSUUtil.py index 84b91ff7..efc7d5be 100644 --- a/src/test/testPSUUtil.py +++ b/src/test/testcases/testPSUUtil.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPSUUtil.py $ +# $Source: src/test/testcases/testPSUUtil.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutGetInScom.py b/src/test/testcases/testPutGetInScom.py index 03571eaa..2e42a253 100755 --- a/src/test/testPutGetInScom.py +++ b/src/test/testcases/testPutGetInScom.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutGetInScom.py $ +# $Source: src/test/testcases/testPutGetInScom.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutGetMem.xml b/src/test/testcases/testPutGetMem.xml index c386c933..ae82868c 100644 --- a/src/test/testPutGetMem.xml +++ b/src/test/testcases/testPutGetMem.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testPutGetMem.xml $ --> +<!-- $Source: src/test/testcases/testPutGetMem.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testPutGetRegFpr.py b/src/test/testcases/testPutGetRegFpr.py index 2b2cd75c..6bf0209e 100755 --- a/src/test/testPutGetRegFpr.py +++ b/src/test/testcases/testPutGetRegFpr.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutGetRegFpr.py $ +# $Source: src/test/testcases/testPutGetRegFpr.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutGetRegGpr.py b/src/test/testcases/testPutGetRegGpr.py index cd1e31b4..871ff375 100755 --- a/src/test/testPutGetRegGpr.py +++ b/src/test/testcases/testPutGetRegGpr.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutGetRegGpr.py $ +# $Source: src/test/testcases/testPutGetRegGpr.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutGetRegSpr.py b/src/test/testcases/testPutGetRegSpr.py index 55c6fa09..d42e4c53 100755 --- a/src/test/testPutGetRegSpr.py +++ b/src/test/testcases/testPutGetRegSpr.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutGetRegSpr.py $ +# $Source: src/test/testcases/testPutGetRegSpr.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutGetScom.py b/src/test/testcases/testPutGetScom.py index de020fb2..9c8700e4 100755 --- a/src/test/testPutGetScom.py +++ b/src/test/testcases/testPutGetScom.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutGetScom.py $ +# $Source: src/test/testcases/testPutGetScom.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutMem.py b/src/test/testcases/testPutMem.py index eec39f5f..cb0398ff 100644 --- a/src/test/testPutMem.py +++ b/src/test/testcases/testPutMem.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutMem.py $ +# $Source: src/test/testcases/testPutMem.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutMem_fail.py b/src/test/testcases/testPutMem_fail.py index b13032a1..a3ab46b5 100644 --- a/src/test/testPutMem_fail.py +++ b/src/test/testcases/testPutMem_fail.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutMem_fail.py $ +# $Source: src/test/testcases/testPutMem_fail.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testPutScomUnderMask.py b/src/test/testcases/testPutScomUnderMask.py index c8c58427..b3484bef 100755 --- a/src/test/testPutScomUnderMask.py +++ b/src/test/testcases/testPutScomUnderMask.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testPutScomUnderMask.py $ +# $Source: src/test/testcases/testPutScomUnderMask.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testRegAccess.xml b/src/test/testcases/testRegAccess.xml index a44eecac..c5876c0b 100755 --- a/src/test/testRegAccess.xml +++ b/src/test/testcases/testRegAccess.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testRegAccess.xml $ --> +<!-- $Source: src/test/testcases/testRegAccess.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testRegistry.py b/src/test/testcases/testRegistry.py index ff205dbd..dc15fc87 100644 --- a/src/test/testRegistry.py +++ b/src/test/testcases/testRegistry.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testRegistry.py $ +# $Source: src/test/testcases/testRegistry.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testSbeDump.py b/src/test/testcases/testSbeDump.py index 72d089e0..7d7a7d77 100644 --- a/src/test/testSbeDump.py +++ b/src/test/testcases/testSbeDump.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testSbeDump.py $ +# $Source: src/test/testcases/testSbeDump.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testScom.xml b/src/test/testcases/testScom.xml index d3df6196..6f59c7cd 100755 --- a/src/test/testScom.xml +++ b/src/test/testcases/testScom.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testScom.xml $ --> +<!-- $Source: src/test/testcases/testScom.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testSram.py b/src/test/testcases/testSram.py index 2b62597f..ca064c77 100644 --- a/src/test/testSram.py +++ b/src/test/testcases/testSram.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testSram.py $ +# $Source: src/test/testcases/testSram.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testSram.xml b/src/test/testcases/testSram.xml index 902786ad..a1e74162 100755 --- a/src/test/testSram.xml +++ b/src/test/testcases/testSram.xml @@ -1,7 +1,7 @@ <!-- IBM_PROLOG_BEGIN_TAG --> <!-- This is an automatically generated prolog. --> <!-- --> -<!-- $Source: src/test/testSram.xml $ --> +<!-- $Source: src/test/testcases/testSram.xml $ --> <!-- --> <!-- OpenPOWER sbe Project --> <!-- --> diff --git a/src/test/testStartInstruction.py b/src/test/testcases/testStartInstruction.py index d45e791c..cc5cba02 100644 --- a/src/test/testStartInstruction.py +++ b/src/test/testcases/testStartInstruction.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testStartInstruction.py $ +# $Source: src/test/testcases/testStartInstruction.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testStopInstruction.py b/src/test/testcases/testStopInstruction.py index a43463c7..37d79acf 100644 --- a/src/test/testStopInstruction.py +++ b/src/test/testcases/testStopInstruction.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testStopInstruction.py $ +# $Source: src/test/testcases/testStopInstruction.py $ # # OpenPOWER sbe Project # diff --git a/src/test/testUtil.py b/src/test/testcases/testUtil.py index 444319ab..2312d2b7 100644 --- a/src/test/testUtil.py +++ b/src/test/testcases/testUtil.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/test/testUtil.py $ +# $Source: src/test/testcases/testUtil.py $ # # OpenPOWER sbe Project # diff --git a/src/tools/debug/sbe-debug.py b/src/tools/debug/hw-debug-framework.py index dbea27d8..7d294e15 100755 --- a/src/tools/debug/sbe-debug.py +++ b/src/tools/debug/hw-debug-framework.py @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/debug/sbe-debug.py $ +# $Source: src/tools/debug/hw-debug-framework.py $ # # OpenPOWER sbe Project # diff --git a/src/tools/debug/simics/simics-debug-framework.py b/src/tools/debug/simics-debug-framework.py index 87d3656b..d15212ea 100755 --- a/src/tools/debug/simics/simics-debug-framework.py +++ b/src/tools/debug/simics-debug-framework.py @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/debug/simics/simics-debug-framework.py $ +# $Source: src/tools/debug/simics-debug-framework.py $ # # OpenPOWER sbe Project # diff --git a/src/tools/debug/simics/sbe_standalone.simics b/src/tools/debug/simics/sbe_standalone.simics deleted file mode 100755 index 8fd3bdb0..00000000 --- a/src/tools/debug/simics/sbe_standalone.simics +++ /dev/null @@ -1,2 +0,0 @@ -echo "SBE standalone Tools" - diff --git a/src/tools/image/Makefile b/src/tools/image/Makefile index fab89e66..58650875 100644 --- a/src/tools/image/Makefile +++ b/src/tools/image/Makefile @@ -6,6 +6,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -59,28 +60,23 @@ else CXX = g++ endif -UTILITIES-SOURCES = sbe_default_tool.c -UTILITIES = sbe_default_tool - -# Utility targets -UTILITIES-OBJc = $(patsubst %.c,$(BASE_OBJDIR)/%.o,$(UTILITIES-SOURCES)) -UTILITIES-OBJECTS += $(patsubst %.C,$(BASE_OBJDIR)/%.o,$(UTILITIES-OBJc)) -UTILITIES-DEPENDENCIES = $(patsubst %.o,%.d,$(UTILITIES-OBJECTS)) -UTILITIES-EXECUTABLES = $(patsubst %,$(BASE_OBJDIR)/%,$(UTILITIES)) - .PHONY : all utilities clean -all: utilities +all:objdir utilities + +objdir: + mkdir -p $(BASE_OBJDIR)/tools/image -utilities: $(UTILITIES-EXECUTABLES) +utilities: $(IMG_DIR)/sbe_default_tool CXXFLAGS+=-DFAPI2_NO_FFDC -$(BASE_OBJDIR)/%.o: %.c +$(BASE_OBJDIR)/tools/image/%.o: %.c $(CXX) -std=c++11 $(INCLUDES) $(CXXFLAGS) -c -o $@ $< -$(BASE_OBJDIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/sbe_default_tool.o +$(IMG_DIR)/sbe_default_tool: $(P9_XIP_BINDIR)/p9_xip_image.o $(BASE_OBJDIR)/tools/image/sbe_default_tool.o $(CXX) $(CXXFLAGS) ${INCLUDES} -o $@ $^ clean: - rm -f $(BASE_OBJDIR)/sbe_default_tool* + rm -f $(BASE_OBJDIR)/tools/image/sbe_default_tool* + rm -f $(IMG_DIR)/sbe_default_tool* diff --git a/src/tools/scripts/ppeSetFixed.pl b/src/tools/scripts/ppeSetFixed.pl index ab92ec42..52880258 100755 --- a/src/tools/scripts/ppeSetFixed.pl +++ b/src/tools/scripts/ppeSetFixed.pl @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2015,2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +29,7 @@ use strict; my $attrpath = "../../importtemp/xml"; -my $sbedefaultpath = "../../script/image"; +my $sbedefaultpath = "../../../images"; #------------------------------------------------------------------------------ # Print Command Line Help diff --git a/src/tools/ppetracepp/Makefile b/src/tools/trace/Makefile index eec6da6a..547cff57 100644 --- a/src/tools/ppetracepp/Makefile +++ b/src/tools/trace/Makefile @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/ppetracepp/Makefile $ +# $Source: src/tools/trace/Makefile $ # # OpenPOWER sbe Project # diff --git a/src/tools/ppetracepp/cmvc/makefile b/src/tools/trace/cmvc/makefile index cf2ad437..3c96ca18 100644 --- a/src/tools/ppetracepp/cmvc/makefile +++ b/src/tools/trace/cmvc/makefile @@ -1,7 +1,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/ppetracepp/cmvc/makefile $ +# $Source: src/tools/trace/cmvc/makefile $ # # OpenPOWER sbe Project # diff --git a/src/tools/ppetracepp/jhash.h b/src/tools/trace/jhash.h index 0dcc3bf3..5bfe5fb3 100755 --- a/src/tools/ppetracepp/jhash.h +++ b/src/tools/trace/jhash.h @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/jhash.h $ */ +/* $Source: src/tools/trace/jhash.h $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/ppe2fsp.c b/src/tools/trace/ppe2fsp.c index d681b147..c1ddc610 100755 --- a/src/tools/ppetracepp/ppe2fsp.c +++ b/src/tools/trace/ppe2fsp.c @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/ppe2fsp.c $ */ +/* $Source: src/tools/trace/ppe2fsp.c $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/ppe2fsp.h b/src/tools/trace/ppe2fsp.h index 2abb146c..56f0a0bd 100644 --- a/src/tools/ppetracepp/ppe2fsp.h +++ b/src/tools/trace/ppe2fsp.h @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/ppe2fsp.h $ */ +/* $Source: src/tools/trace/ppe2fsp.h $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/ppe2fsp_cmd.c b/src/tools/trace/ppe2fsp_cmd.c index c36d735c..bab51ab5 100644 --- a/src/tools/ppetracepp/ppe2fsp_cmd.c +++ b/src/tools/trace/ppe2fsp_cmd.c @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/ppe2fsp_cmd.c $ */ +/* $Source: src/tools/trace/ppe2fsp_cmd.c $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/ppetracepp.C b/src/tools/trace/ppetracepp.C index 2829e4dd..9d795371 100755 --- a/src/tools/ppetracepp/ppetracepp.C +++ b/src/tools/trace/ppetracepp.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/ppetracepp.C $ */ +/* $Source: src/tools/trace/ppetracepp.C $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/trac_interface.h b/src/tools/trace/trac_interface.h index 2ff9dff0..ce9355ae 100755 --- a/src/tools/ppetracepp/trac_interface.h +++ b/src/tools/trace/trac_interface.h @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/tools/ppetracepp/trac_interface.h $ */ +/* $Source: src/tools/trace/trac_interface.h $ */ /* */ /* OpenPOWER sbe Project */ /* */ diff --git a/src/tools/ppetracepp/tracehash.pl b/src/tools/trace/tracehash.pl index 8855adee..a278741a 100755 --- a/src/tools/ppetracepp/tracehash.pl +++ b/src/tools/trace/tracehash.pl @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/ppetracepp/tracehash.pl $ +# $Source: src/tools/trace/tracehash.pl $ # # OpenPOWER sbe Project # diff --git a/src/tools/utils/perl.modules/gitUtil.pm b/src/tools/utils/modules/gitUtil.pm index bbfd7092..b94f711c 100644 --- a/src/tools/utils/perl.modules/gitUtil.pm +++ b/src/tools/utils/modules/gitUtil.pm @@ -2,7 +2,7 @@ # IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/tools/utils/perl.modules/gitUtil.pm $ +# $Source: src/tools/utils/modules/gitUtil.pm $ # # OpenPOWER sbe Project # diff --git a/src/tools/utils/sbeGitTool.pl b/src/tools/utils/sbeGitTool.pl index 9ffd4b2b..120a906e 100755 --- a/src/tools/utils/sbeGitTool.pl +++ b/src/tools/utils/sbeGitTool.pl @@ -7,6 +7,7 @@ # OpenPOWER sbe Project # # Contributors Listed Below - COPYRIGHT 2016 +# [+] International Business Machines Corp. # # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,7 +26,7 @@ use strict; #use lib "$ENV{'PERLMODULES'}"; -use lib "src/tools/utils/perl.modules"; +use lib "src/tools/utils/modules"; use Getopt::Long qw(:config pass_through); use Data::Dumper; use Cwd; |