diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index 50873a8..137954a 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -38,18 +38,19 @@ TWLSDK_VERSION_MAJOR ?= 0 # TWL_PLATFORM ?= BB -TWL_MEMSIZE ?= 8M -TWL_CODEGEN ?= ARM -TWL_PROC ?= ARM9 +TWL_MEMSIZE ?= 8M +TWL_CODEGEN ?= ARM +TWL_PROC ?= ARM9 # replace NitroSDK NITRO_PLATFORM = TS NITRO_MEMSIZE = $(TWL_MEMSIZE) NITRO_CODEGEN = $(TWL_CODEGEN) -NITRO_PROC = $(TWL_PROC) +NITRO_PROC = $(TWL_PROC) -ifndef TWL_CODEGEN_PROC -TWL_CODEGEN_PROC := $(TWL_PROC) +# replace NitroSDK +ifndef CODEGEN_PROC +CODEGEN_PROC := $(TWL_PROC) endif ifeq ($(TWL_CODEGEN),ALL) @@ -113,7 +114,7 @@ TWL_ADDINS ?= $(TWL_ROOT)/add-ins TWL_NITROSDK_ROOT ?= $(subst $(SPACE),\ ,$(subst \,/,$(NITROSDK_ROOT))) -TWL_BUILDARCH ?= $(TWL_CODEGEN_PROC)-$(TWL_PLATFORM)$(TWL_CODEGEN_ARCH) +TWL_BUILDARCH ?= $(CODEGEN_PROC)-$(TWL_PLATFORM)$(TWL_CODEGEN_ARCH) TWL_BUILDARCH_ARM9 := ARM9-$(TWL_PLATFORM)$(TWL_CODEGEN_ARCH) TWL_BUILDARCH_ARM7 := ARM7-$(TWL_PLATFORM)$(TWL_CODEGEN_ARCH) @@ -121,7 +122,7 @@ TWL_BUILDTYPE ?= $(TWL_BUILDARCH)/$(TWL_BUILD_DIR) TWL_BUILDTYPE_ARM9 := $(TWL_BUILDARCH_ARM9)/$(TWL_BUILD_DIR) TWL_BUILDTYPE_ARM7 := $(TWL_BUILDARCH_ARM7)/$(TWL_BUILD_DIR) -TWL_LIBARCH := $(TWL_CODEGEN_PROC)-$(TWL_PLATFORM) +TWL_LIBARCH := $(CODEGEN_PROC)-$(TWL_PLATFORM) TWL_LIBTYPE := $(TWL_LIBARCH)/$(TWL_BUILD_DIR) TWL_LIBDIR := $(TWL_ROOT)/lib/$(TWL_LIBTYPE) TWL_LIBSYSCALLDIR := $(TWL_ROOT)/lib/$(TWL_LIBARCH)/etc @@ -149,7 +150,7 @@ LCFILE_SPEC ?= $(DEFAULT_TWL_LCFILE_SPEC) CRT0_O ?= crt0.o -ifeq ($(TWL_CODEGEN_PROC),ARM9) +ifeq ($(CODEGEN_PROC),ARM9) TWL_LIBS_BASE ?= \ libos \ @@ -162,7 +163,7 @@ ifdef TWL_PROFILE_TYPE TWL_LIBS_BASE += libos.$(TWL_PROFILE_TYPE) endif -else # ($(TWL_CODEGEN_PROC),ARM7) +else # ($(CODEGEN_PROC),ARM7) TWL_LIBS_BASE ?= \ libos_sp \ diff --git a/build/buildtools/template/Copyright.Header b/build/buildtools/template/Copyright.Header new file mode 100644 index 0000000..739e640 --- /dev/null +++ b/build/buildtools/template/Copyright.Header @@ -0,0 +1,15 @@ +/*---------------------------------------------------------------------------* + Project: TwlSDK - GX - + File: XXXXXXXX.c + + Copyright 2007 Nintendo. All rights reserved. + + These coded instructions, statements, and computer programs contain + proprietary information of Nintendo of America Inc. and/or Nintendo + Company Ltd., and are protected by Federal copyright law. They may + not be disclosed to third parties or copied or duplicated in any form, + in whole or in part, without the prior written consent of Nintendo. + + $Log: $ + $NoKeywords: $ + *---------------------------------------------------------------------------*/ diff --git a/build/buildtools/template/Function.Header b/build/buildtools/template/Function.Header new file mode 100644 index 0000000..c1b77fe --- /dev/null +++ b/build/buildtools/template/Function.Header @@ -0,0 +1,12 @@ +/*---------------------------------------------------------------------------* + Name: OSExceptionInit + + Description: Performs exception initialization. + - installs the first level exception handlers + - set up exception table and common exception handler + + Arguments: installDBIntegrator if TRUE, copy OSDBIntegrator into + low memory. + + Returns: None. + *---------------------------------------------------------------------------*/ diff --git a/build/buildtools/template/Makefile.BuildSrc b/build/buildtools/template/Makefile.BuildSrc new file mode 100644 index 0000000..a3185cc --- /dev/null +++ b/build/buildtools/template/Makefile.BuildSrc @@ -0,0 +1,40 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - - +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Log: $ +# $NoKeywords: $ +#---------------------------------------------------------------------------- + +SUBDIRS = + + +#---------------------------------------------------------------------------- + +SRCS = main.c +TARGET_BIN = main.srl + +#SRCDIR = # using default +#LCFILE = # using default + +include $(TWLSDK_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- + +do-build: $(TARGETS) + + +include $(TWLSDK_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/buildtools/template/Makefile.BuildSrc.ARM7 b/build/buildtools/template/Makefile.BuildSrc.ARM7 new file mode 100644 index 0000000..51cd173 --- /dev/null +++ b/build/buildtools/template/Makefile.BuildSrc.ARM7 @@ -0,0 +1,44 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - - +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Log: $ +# $NoKeywords: $ +#---------------------------------------------------------------------------- + +SUBDIRS = + +#---------------------------------------------------------------------------- + +# Codegen for sub processer +CODEGEN_PROC = ARM7 + + +SRCS = main.c +TARGET_BIN = main.srl + + +#SRCDIR = +#LCFILE = + +include $(TWLSDK_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- + +do-build: $(TARGETS) + + +include $(TWLSDK_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/build/buildtools/template/Makefile.BuildSubdir b/build/buildtools/template/Makefile.BuildSubdir new file mode 100644 index 0000000..0f28b0a --- /dev/null +++ b/build/buildtools/template/Makefile.BuildSubdir @@ -0,0 +1,31 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - - +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded instructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# not be disclosed to third parties or copied or duplicated in any form, +# in whole or in part, without the prior written consent of Nintendo. +# +# $Log: $ +# $NoKeywords: $ +#---------------------------------------------------------------------------- + +include $(TWLSDK_ROOT)/build/buildtools/commondefs + + +#---------------------------------------------------------------------------- + +SUBDIRS = + + +#---------------------------------------------------------------------------- + +include $(TWLSDK_ROOT)/build/buildtools/modulerules + + +#===== End of Makefile ===== diff --git a/tools/axd/ARM9.ses b/tools/axd/ARM9.ses index c58d086..6f51f85 100644 --- a/tools/axd/ARM9.ses +++ b/tools/axd/ARM9.ses @@ -1,17 +1,3 @@ -[Breakpoints\1] -Processor=ARM946E_S_0 -dwTarget Count=1 -dwAction=0 -dwState=0 -Parent Image=C:\twl\bootrom\build\bootrom\ts\ARM9\bin\ARM9-BB.thumb\Release\brom9_ts.axf -dwSet By Source Pos=0 -Image=C:\twl\bootrom\build\bootrom\ts\ARM9\bin\ARM9-BB.thumb\Release\brom9_ts.axf -File=C:\twl\bootrom\build\bootrom\ts\ARM9\bin\ARM9-BB.thumb\Release\main.c -dwLine=20 -dwColumn=1 -dwAddressLo=-59312 -dwAddressHi=0 -dwBreakpoint Size=0 [CLI] dwParse=1 dwEcho=1 @@ -25,6 +11,9 @@ Format=hex FormatPar=-1 dwLogFile=0 dwRecordFile=0 +[Console] +dwLogStatus=0 +dwReadStatus=0 [Control] dwActiveTab=0 [DebugEnvironment] @@ -34,15 +23,16 @@ dwActiveTab=0 [DebugInternals\InternalVariables] dwRefresh=1 [Docking] -biBarID_0=AMAAAAAABJAAAAAAAMAAAAAAIEAAAAAAAMAAAAAAHLBAAAAAOPPPPPPPMEAAAAAAAAAAAAAAAAPBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +biBarID_0=AMAAAAAABJAAAAAAAMAAAAAAIEAAAAAAAMAAAAAAACBAAAAAOPPPPPPPMEAAAAAAAAAAAAAAAAPBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_4=AMAAAAAABJAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPJACAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_65539=LCCAAAAAKJBAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOHCAAAAAPFCAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_1114115=AMAAAAAABJAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPJACAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -biBarID_65538=BEBAAAAAIGBAAAAAAMAAAAAAIEAAAAAAAMAAAAAAICAAAAAABCAAAAAACPBAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +biBarID_65538=BEBAAAAAOHBAAAAAAMAAAAAAIEAAAAAAAMAAAAAAICAAAAAAODAAAAAAGLCAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_1=AMAAAAAABJAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPCHBAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_65540=JCBAAAAAEKBAAAAAAMAAAAAAIEAAAAAAAMAAAAAAMGAAAAAALEDAAAAADHBAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_7=MFBAAAAAIKAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAADFDAAAAAEGCAAAAACAAAAAAABAPCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA biBarID_6=AMAAAAAABJAAAAAAAMAAAAAAIEAAAAAAAMAAAAAAICAAAAAAOPPPPPPPMBAAAAAAAAAAAAAAAAPBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +biBarID_65543=AMAAAAAABJAAAAAAILDAAAAABJAAAAAAMGAAAAAAAIAAAAAAOPPPPPPPCHBAAAAAAAAAAAAAAAPIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA [Docking\OpenStates] biBarID_0=BAAAAAAA biBarID_4=BAAAAAAA @@ -51,6 +41,7 @@ biBarID_7=BAAAAAAA biBarID_65538=BAAAAAAA biBarID_65539=BAAAAAAA biBarID_65540=BAAAAAAA +biBarID_65543=BAAAAAAA [Images\Image_0] Filename=C:\twl\bootrom\build\bootrom\ts\ARM9\bin\ARM9-BB.thumb\Release\brom9_ts.axf Processor=ARM946E_S_0 @@ -146,7 +137,7 @@ dwListSize=4 dwTargetAccessSize=0 dwAutoRefresh=1 [Output] -dwActiveTab=1 +dwActiveTab=0 [ProcessorRegisters\ARM946E_S_0] dwFormatID=-1 dwRefresh=0 @@ -191,10 +182,11 @@ dwBar#10=65540 dwBar#11=0 [ToolBars\ToolBarID-Bar1] dwBarID=59422 -dwBars=3 +dwBars=4 dwBar#0=0 -dwBar#1=4 -dwBar#2=0 +dwBar#1=7 +dwBar#2=4 +dwBar#3=0 [ToolBars\ToolBarID-Bar2] dwBarID=59420 dwBars=3 @@ -215,8 +207,8 @@ dwBar#2=0 dwBarID=59423 dwHorz=1 dwFloating=1 -dwXPos=37 -dwYPos=518 +dwXPos=66 +dwYPos=714 dwBars=3 dwBar#0=0 dwBar#1=2