-
-
Notifications
You must be signed in to change notification settings - Fork 67
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Proper handling of SetApplicationCpuTimeLimit
with invalid parameters
#353
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,258 @@ | ||
#--------------------------------------------------------------------------------- | ||
.SUFFIXES: | ||
#--------------------------------------------------------------------------------- | ||
|
||
ifeq ($(strip $(DEVKITARM)),) | ||
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM") | ||
endif | ||
|
||
TOPDIR ?= $(CURDIR) | ||
include $(DEVKITARM)/3ds_rules | ||
|
||
#--------------------------------------------------------------------------------- | ||
# TARGET is the name of the output | ||
# BUILD is the directory where object files & intermediate files will be placed | ||
# SOURCES is a list of directories containing source code | ||
# DATA is a list of directories containing data files | ||
# INCLUDES is a list of directories containing header files | ||
# GRAPHICS is a list of directories containing graphics files | ||
# GFXBUILD is the directory where converted graphics files will be placed | ||
# If set to $(BUILD), it will statically link in the converted | ||
# files as if they were data files. | ||
# | ||
# NO_SMDH: if set to anything, no SMDH file is generated. | ||
# ROMFS is the directory which contains the RomFS, relative to the Makefile (Optional) | ||
# APP_TITLE is the name of the app stored in the SMDH file (Optional) | ||
# APP_DESCRIPTION is the description of the app stored in the SMDH file (Optional) | ||
# APP_AUTHOR is the author of the app stored in the SMDH file (Optional) | ||
# ICON is the filename of the icon (.png), relative to the project folder. | ||
# If not set, it attempts to use one of the following (in this order): | ||
# - <Project name>.png | ||
# - icon.png | ||
# - <libctru folder>/default_icon.png | ||
#--------------------------------------------------------------------------------- | ||
TARGET := AppCpuTimeLimit | ||
BUILD := build | ||
SOURCES := source | ||
DATA := data | ||
INCLUDES := include | ||
GRAPHICS := gfx | ||
GFXBUILD := $(BUILD) | ||
#ROMFS := romfs | ||
#GFXBUILD := $(ROMFS)/gfx | ||
APP_TITLE := AppCpuTimeLimit | ||
APP_DESCRIPTION := Tests Set/GetAppCpuTimeLimit | ||
APP_AUTHOR := noumidev | ||
|
||
#--------------------------------------------------------------------------------- | ||
# options for code generation | ||
#--------------------------------------------------------------------------------- | ||
ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft | ||
|
||
CFLAGS := -g -Wall -O2 -mword-relocations \ | ||
-ffunction-sections \ | ||
$(ARCH) | ||
|
||
CFLAGS += $(INCLUDE) -D__3DS__ | ||
|
||
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 | ||
|
||
ASFLAGS := -g $(ARCH) | ||
LDFLAGS = -specs=3dsx.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) | ||
|
||
LIBS := -lctru -lm | ||
|
||
#--------------------------------------------------------------------------------- | ||
# list of directories containing libraries, this must be the top level containing | ||
# include and lib | ||
#--------------------------------------------------------------------------------- | ||
LIBDIRS := $(CTRULIB) | ||
|
||
|
||
#--------------------------------------------------------------------------------- | ||
# no real need to edit anything past this point unless you need to add additional | ||
# rules for different file extensions | ||
#--------------------------------------------------------------------------------- | ||
ifneq ($(BUILD),$(notdir $(CURDIR))) | ||
#--------------------------------------------------------------------------------- | ||
|
||
export OUTPUT := $(CURDIR)/$(TARGET) | ||
export TOPDIR := $(CURDIR) | ||
|
||
export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ | ||
$(foreach dir,$(GRAPHICS),$(CURDIR)/$(dir)) \ | ||
$(foreach dir,$(DATA),$(CURDIR)/$(dir)) | ||
|
||
export DEPSDIR := $(CURDIR)/$(BUILD) | ||
|
||
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) | ||
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) | ||
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) | ||
PICAFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.v.pica))) | ||
SHLISTFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.shlist))) | ||
GFXFILES := $(foreach dir,$(GRAPHICS),$(notdir $(wildcard $(dir)/*.t3s))) | ||
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) | ||
|
||
#--------------------------------------------------------------------------------- | ||
# use CXX for linking C++ projects, CC for standard C | ||
#--------------------------------------------------------------------------------- | ||
ifeq ($(strip $(CPPFILES)),) | ||
#--------------------------------------------------------------------------------- | ||
export LD := $(CC) | ||
#--------------------------------------------------------------------------------- | ||
else | ||
#--------------------------------------------------------------------------------- | ||
export LD := $(CXX) | ||
#--------------------------------------------------------------------------------- | ||
endif | ||
#--------------------------------------------------------------------------------- | ||
|
||
#--------------------------------------------------------------------------------- | ||
ifeq ($(GFXBUILD),$(BUILD)) | ||
#--------------------------------------------------------------------------------- | ||
export T3XFILES := $(GFXFILES:.t3s=.t3x) | ||
#--------------------------------------------------------------------------------- | ||
else | ||
#--------------------------------------------------------------------------------- | ||
export ROMFS_T3XFILES := $(patsubst %.t3s, $(GFXBUILD)/%.t3x, $(GFXFILES)) | ||
export T3XHFILES := $(patsubst %.t3s, $(BUILD)/%.h, $(GFXFILES)) | ||
#--------------------------------------------------------------------------------- | ||
endif | ||
#--------------------------------------------------------------------------------- | ||
|
||
export OFILES_SOURCES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) | ||
|
||
export OFILES_BIN := $(addsuffix .o,$(BINFILES)) \ | ||
$(PICAFILES:.v.pica=.shbin.o) $(SHLISTFILES:.shlist=.shbin.o) \ | ||
$(addsuffix .o,$(T3XFILES)) | ||
|
||
export OFILES := $(OFILES_BIN) $(OFILES_SOURCES) | ||
|
||
export HFILES := $(PICAFILES:.v.pica=_shbin.h) $(SHLISTFILES:.shlist=_shbin.h) \ | ||
$(addsuffix .h,$(subst .,_,$(BINFILES))) \ | ||
$(GFXFILES:.t3s=.h) | ||
|
||
export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ | ||
$(foreach dir,$(LIBDIRS),-I$(dir)/include) \ | ||
-I$(CURDIR)/$(BUILD) | ||
|
||
export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) | ||
|
||
export _3DSXDEPS := $(if $(NO_SMDH),,$(OUTPUT).smdh) | ||
|
||
ifeq ($(strip $(ICON)),) | ||
icons := $(wildcard *.png) | ||
ifneq (,$(findstring $(TARGET).png,$(icons))) | ||
export APP_ICON := $(TOPDIR)/$(TARGET).png | ||
else | ||
ifneq (,$(findstring icon.png,$(icons))) | ||
export APP_ICON := $(TOPDIR)/icon.png | ||
endif | ||
endif | ||
else | ||
export APP_ICON := $(TOPDIR)/$(ICON) | ||
endif | ||
|
||
ifeq ($(strip $(NO_SMDH)),) | ||
export _3DSXFLAGS += --smdh=$(CURDIR)/$(TARGET).smdh | ||
endif | ||
|
||
ifneq ($(ROMFS),) | ||
export _3DSXFLAGS += --romfs=$(CURDIR)/$(ROMFS) | ||
endif | ||
|
||
.PHONY: all clean | ||
|
||
#--------------------------------------------------------------------------------- | ||
all: $(BUILD) $(GFXBUILD) $(DEPSDIR) $(ROMFS_T3XFILES) $(T3XHFILES) | ||
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile | ||
|
||
$(BUILD): | ||
@mkdir -p $@ | ||
|
||
ifneq ($(GFXBUILD),$(BUILD)) | ||
$(GFXBUILD): | ||
@mkdir -p $@ | ||
endif | ||
|
||
ifneq ($(DEPSDIR),$(BUILD)) | ||
$(DEPSDIR): | ||
@mkdir -p $@ | ||
endif | ||
|
||
#--------------------------------------------------------------------------------- | ||
clean: | ||
@echo clean ... | ||
@rm -fr $(BUILD) $(TARGET).3dsx $(OUTPUT).smdh $(TARGET).elf $(GFXBUILD) | ||
|
||
#--------------------------------------------------------------------------------- | ||
$(GFXBUILD)/%.t3x $(BUILD)/%.h : %.t3s | ||
#--------------------------------------------------------------------------------- | ||
@echo $(notdir $<) | ||
@tex3ds -i $< -H $(BUILD)/$*.h -d $(DEPSDIR)/$*.d -o $(GFXBUILD)/$*.t3x | ||
|
||
#--------------------------------------------------------------------------------- | ||
else | ||
|
||
#--------------------------------------------------------------------------------- | ||
# main targets | ||
#--------------------------------------------------------------------------------- | ||
$(OUTPUT).3dsx : $(OUTPUT).elf $(_3DSXDEPS) | ||
|
||
$(OFILES_SOURCES) : $(HFILES) | ||
|
||
$(OUTPUT).elf : $(OFILES) | ||
|
||
#--------------------------------------------------------------------------------- | ||
# you need a rule like this for each extension you use as binary data | ||
#--------------------------------------------------------------------------------- | ||
%.bin.o %_bin.h : %.bin | ||
#--------------------------------------------------------------------------------- | ||
@echo $(notdir $<) | ||
@$(bin2o) | ||
|
||
#--------------------------------------------------------------------------------- | ||
.PRECIOUS : %.t3x | ||
#--------------------------------------------------------------------------------- | ||
%.t3x.o %_t3x.h : %.t3x | ||
#--------------------------------------------------------------------------------- | ||
@echo $(notdir $<) | ||
@$(bin2o) | ||
|
||
#--------------------------------------------------------------------------------- | ||
# rules for assembling GPU shaders | ||
#--------------------------------------------------------------------------------- | ||
define shader-as | ||
$(eval CURBIN := $*.shbin) | ||
$(eval DEPSFILE := $(DEPSDIR)/$*.shbin.d) | ||
echo "$(CURBIN).o: $< $1" > $(DEPSFILE) | ||
echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(CURBIN) | tr . _)`.h | ||
echo "extern const u8" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(CURBIN) | tr . _)`.h | ||
echo "extern const u32" `(echo $(CURBIN) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(CURBIN) | tr . _)`.h | ||
picasso -o $(CURBIN) $1 | ||
bin2s $(CURBIN) | $(AS) -o $*.shbin.o | ||
endef | ||
|
||
%.shbin.o %_shbin.h : %.v.pica %.g.pica | ||
@echo $(notdir $^) | ||
@$(call shader-as,$^) | ||
|
||
%.shbin.o %_shbin.h : %.v.pica | ||
@echo $(notdir $<) | ||
@$(call shader-as,$<) | ||
|
||
%.shbin.o %_shbin.h : %.shlist | ||
@echo $(notdir $<) | ||
@$(call shader-as,$(foreach file,$(shell cat $<),$(dir $<)$(file))) | ||
|
||
#--------------------------------------------------------------------------------- | ||
%.t3x %.h : %.t3s | ||
#--------------------------------------------------------------------------------- | ||
@echo $(notdir $<) | ||
@tex3ds -i $< -H $*.h -d $*.d -o $*.t3x | ||
|
||
-include $(DEPSDIR)/*.d | ||
|
||
#--------------------------------------------------------------------------------------- | ||
endif | ||
#--------------------------------------------------------------------------------------- |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
#include <3ds.h> | ||
|
||
#include <stdio.h> | ||
|
||
int main(int argc, char **argv) { | ||
gfxInitDefault(); | ||
|
||
consoleInit(GFX_TOP, NULL); | ||
|
||
printf("--- APT::SetAppCpuTimeLimit ---\n\n"); | ||
|
||
// Get initial percentage | ||
u32 percentage; | ||
APT_GetAppCpuTimeLimit(&percentage); | ||
|
||
printf("Initial percentage: %lu\n\n", percentage); | ||
|
||
// Try all percentages from 0-100%, print failed calls | ||
for (int i = 0; i <= 100; i++) { | ||
const Result res = APT_SetAppCpuTimeLimit(i); | ||
|
||
if (R_FAILED(res)) { | ||
APT_GetAppCpuTimeLimit(&percentage); | ||
|
||
printf("[%d:%lu:%lX]\n", i, percentage, res); | ||
} | ||
} | ||
|
||
// Send command with invalid fixed value | ||
u32 aptcmdbuf[16]; | ||
aptcmdbuf[0] = 0x004F0080; | ||
aptcmdbuf[1] = 0; | ||
aptcmdbuf[2] = 20; | ||
|
||
aptSendCommand(aptcmdbuf); | ||
|
||
printf("\nWith fixed = 0: [%08lX:%08lX]\n", aptcmdbuf[0], aptcmdbuf[1]); | ||
|
||
while (aptMainLoop()) { | ||
hidScanInput(); | ||
|
||
if ((hidKeysDown() & KEY_START) != 0) { | ||
break; | ||
} | ||
|
||
gfxFlushBuffers(); | ||
gfxSwapBuffers(); | ||
|
||
gspWaitForVBlank(); | ||
} | ||
|
||
gfxExit(); | ||
|
||
return 0; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation 😢
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No idea how this happened :(