start of tsV2

* switch github CI to docker

* empty commit to trigger CI

.github/workflows/builder.yml

@@ -0,0 +1,23 @@
+name: TegraExplorer builder
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: devkitpro/devkita64_devkitarm
+
+    steps:
+    - uses: actions/checkout@v1
+        
+    - name: Build TegraExplorer
+      run: make -j$(nproc)
+        
+    - uses: actions/upload-artifact@master
+      with:
+        name: TegraExplorer
+        path: output/TegraExplorer.bin 

Makefile

@@ -8,10 +8,10 @@ include $(DEVKITARM)/base_rules
 
 ################################################################################
 
-IPL_LOAD_ADDR := 0x40008000
+IPL_LOAD_ADDR := 0x40003000
 LPVERSION_MAJOR := 3
 LPVERSION_MINOR := 0
-LPVERSION_BUGFX := 1
+LPVERSION_BUGFX := 4
 
 ################################################################################
 

README.md

@@ -1,33 +1,67 @@
 # TegraExplorer
+
+[![TegraExplorer builder](https://github.com/suchmememanyskill/TegraExplorer/workflows/TegraExplorer%20builder/badge.svg)](https://github.com/suchmememanyskill/TegraExplorer/actions)
+[![Downloads](https://img.shields.io/github/downloads/suchmememanyskill/TegraExplorer/total)](https://github.com/suchmememanyskill/TegraExplorer/releases)
+[![Version](https://img.shields.io/github/v/release/suchmememanyskill/tegraexplorer)](https://github.com/suchmememanyskill/TegraExplorer/releases)
+[![Donations](https://img.shields.io/badge/Support%20on-Ko--Fi-red)](https://ko-fi.com/suchmememanyskill)
+
 A payload-based file explorer for your switch!
 
 ## Usage
 1. Get your favorite payload injector
 2. Inject TegraExplorer as a payload
 
-Navigate around the menus using the vol+, vol- and power buttons
+Navigate around the menus using the joycons.
+- A: Select
+- B: Back
+- Left Joystick up/down (Dpad or joystick): navigate menus up/down
+- Right Joystick up/down: fast menu navigation up/down
+- Capture (Minerva only): Take a screenshot
+- L3/R3 (Press joysticks in): Recalibrate centerpoint
+
+If you do not have your joycons connected:
+- Power -> A
+- Vol+ -> Left Joystick up
+- Vol- -> Left Joystick down
 
 ## Functions
 - Navigate the SD card
-- Navigate the System partition of your sysnand/sysmmc
+- Navigate the System partition of your sysmmc and emummc
 - Interact with files
-	- Deleting, copying or moving files
+	- Deleting, copying, renaming and moving files
 	- Launching payloads files
 	- Viewing the hex data of a file
+	- Launching special [TegraScript](https://github.com/suchmememanyskill/TegraScript) files
+	- Renaming files
 - Interacting with folders
-	- Deleting or copying folders
+	- Deleting, copying or renaming folders
+	- Creating folders
 - Dumping your current firmware to sd
 - Formatting the sd card
 
+*and more*
+
 ## Support
 
 For general CFW support, go to the [Nintendo Homebrew](https://discord.gg/C29hYvh) discord
 
 For question specifically for TegraExplorer, go to [my discord](https://discord.gg/aH9rsuP)
 
-# Credits
+## Credits
 Based on [Lockpick_RCM](https://github.com/shchmue/Lockpick_RCM), and thus also based on [Hekate](https://github.com/CTCaer/hekate)
 
-Lots of help from:
+Awesome people who helped with this project:
 - shchmue
-- Denn
+- Dennthecafebabe
+
+Other awesome people:
+- PhazonicRidley
+- Dax
+- Huhen
+- Bleck9999
+- Exelix
+- Emmo
+
+## Screenshots
+
+![Preview](/preview.png)

common/common_gfx.h

@@ -1,8 +1,8 @@
 /*
  * Common Gfx Header
  * Copyright (c) 2018 naehrwert
- * Copyright (c) 2018 CTCaer
+ * Copyright (C) 2018 CTCaer
- * Copyright (c) 2018 M4xw
+ * Copyright (C) 2018 M4xw
  * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,

common/common_module.h

@@ -1,6 +1,6 @@
 /*
  * Common Module Header
- * Copyright (c) 2018 M4xw
+ * Copyright (C) 2018 M4xw
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,

common/memory_map.h

@@ -19,8 +19,8 @@
 
 //#define IPL_STACK_TOP  0x4003FF00
 /* --- BIT/BCT: 0x40000000 - 0x40003000 --- */
-/* ---     IPL: 0x40008000 - 0x40028000 --- */
+/* ---     IPL: 0x40003000 - 0x40028000 --- */
-#define IPL_LOAD_ADDR     0x40008000
+#define IPL_LOAD_ADDR     0x40003000
 #define  IPL_SZ_MAX          0x20000 // 128KB.
 //#define IRAM_LIB_ADDR     0x4002B000
 #define SDRAM_PARAMS_ADDR 0x40030000 // SDRAM extraction buffer during sdram init.

source/config/ini.c

@@ -64,7 +64,7 @@ ini_sec_t *_ini_create_section(link_t *dst, ini_sec_t *csec, char *name, u8 type
 	return csec;
 }
 
-int ini_parse(link_t *dst, char *ini_path, bool is_dir)
+int ini_parse(link_t *dst, const char *ini_path, bool is_dir)
 {
 	u32 lblen;
 	u32 pathlen = strlen(ini_path);
@@ -73,6 +73,7 @@ int ini_parse(link_t *dst, char *ini_path, bool is_dir)
 	char *filelist = NULL;
 	FIL fp;
 	ini_sec_t *csec = NULL;
+	bool firstIniRun = true;
 
 	char *filename = (char *)malloc(256);
 
@@ -116,10 +117,17 @@ int ini_parse(link_t *dst, char *ini_path, bool is_dir)
 
 		do
 		{
+			if (firstIniRun){
+				firstIniRun = false;
+				strcpy(lbuf, "[Unknown]");
+				lblen = 9;
+			}
+			else {
 			// Fetch one line.
 			lbuf[0] = 0;
 			f_gets(lbuf, 512, &fp);
 			lblen = strlen(lbuf);
+			}
 
 			// Remove trailing newline. Depends on 'FF_USE_STRFUNC 2' that removes \r.
 			if (lblen && lbuf[lblen - 1] == '\n')

source/config/ini.h

@@ -43,7 +43,7 @@ typedef struct _ini_sec_t
 	u32 color;
 } ini_sec_t;
 
-int ini_parse(link_t *dst, char *ini_path, bool is_dir);
+int ini_parse(link_t *dst, const char *ini_path, bool is_dir);
 char *ini_check_payload_section(ini_sec_t *cfg);
 
 #endif

source/gfx/gfx.c

@@ -20,6 +20,9 @@
 #include <string.h>
 #include "gfx.h"
 
+gfx_ctxt_t gfx_ctxt;
+gfx_con_t gfx_con;
+
 static const u8 _gfx_font[] = {
 	0x00, 0x0C, 0x12, 0x7E, 0x42, 0x42, 0x7E, 0x00, // Char 030 (folder)
 	0x00, 0x0E, 0x12, 0x22, 0x22, 0x22, 0x3E, 0x00, // Char 031 (file)
@@ -537,6 +540,11 @@ void gfx_boxGrey(int x0, int y0, int x1, int y1, u8 shade){
 		memset(gfx_ctxt.fb + y * gfx_ctxt.stride + y0, shade, (y1 - y0 + 1) * 4);
 	}
 }
+
+void gfx_setPixel(int x, int y, u32 color) {
+	*(gfx_ctxt.fb + (YLEFT - x) * gfx_ctxt.stride + y) = color;
+}
+
 /*
 void gfx_boxGrey_old(int x0, int y0, int x1, int y1, u8 shade){
 	for (int y = y0; y <= y1; y++){

source/gfx/gfx.h

@@ -53,6 +53,7 @@ void gfx_set_rect_argb(const u32 *buf, u32 size_x, u32 size_y, u32 pos_x, u32 po
 void gfx_render_bmp_argb(const u32 *buf, u32 size_x, u32 size_y, u32 pos_x, u32 pos_y);
 void gfx_box(int x0, int y0, int x1, int y1, u32 color);
 void gfx_boxGrey(int x0, int y0, int x1, int y1, u8 shade);
+void gfx_setPixel(int x, int y, u32 color);
 
 /*
 #define GFX_SETPOSCORRECTED(x, y) gfx_con_setpos(y - YLEFT, x)
@@ -61,7 +62,7 @@ void gfx_boxGrey(int x0, int y0, int x1, int y1, u8 shade);
 */
 
 // Global gfx console and context.
-gfx_ctxt_t gfx_ctxt;
+extern gfx_ctxt_t gfx_ctxt;
-gfx_con_t gfx_con;
+extern gfx_con_t gfx_con;
 
 #endif

source/hos/fss.c

@@ -0,0 +1,220 @@
+/*
+ * Atmosphère Fusée Secondary Storage parser.
+ *
+ * Copyright (c) 2019-2020 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+
+#include "fss.h"
+// #include "hos.h"
+#include "../config/config.h"
+#include "../libs/fatfs/ff.h"
+#include "../mem/heap.h"
+#include "../storage/emummc.h"
+#include "../storage/nx_sd.h"
+
+#include "../gfx/gfx.h"
+#define DPRINTF(...)
+
+extern hekate_config h_cfg;
+
+extern bool is_ipl_updated(void *buf, char *path, bool force);
+
+// FSS0 Magic and Meta header offset.
+#define FSS0_MAGIC 0x30535346
+#define FSS0_META_OFFSET 0x4
+
+// FSS0 Content Types.
+#define CNT_TYPE_FSP 0
+#define CNT_TYPE_EXO 1  // Exosphere (Secure Monitor).
+#define CNT_TYPE_WBT 2  // Warmboot (SC7Exit fw).
+#define CNT_TYPE_RBT 3  // Rebootstub (Warmboot based reboot fw).
+#define CNT_TYPE_SP1 4  // Sept Primary (TSEC and Sept Secondary loader).
+#define CNT_TYPE_SP2 5  // Sept Secondary (Acts as pkg11 and derives keys).
+#define CNT_TYPE_KIP 6  // KIP1 (Used for replacement or addition).
+#define CNT_TYPE_BMP 7
+#define CNT_TYPE_EMC 8
+#define CNT_TYPE_KLD 9  // Kernel Loader.
+#define CNT_TYPE_KRN 10 // Kernel.
+
+// FSS0 Content Flags.
+#define CNT_FLAG0_EXPERIMENTAL (1 << 0)
+
+// FSS0 Meta Header.
+typedef struct _fss_meta_t
+{
+	u32 magic;
+	u32 size;
+	u32 crt0_off;
+	u32 cnt_off;
+	u32 cnt_count;
+	u32 hos_ver;
+	u32 version;
+	u32 git_rev;
+} fss_meta_t;
+
+// FSS0 Content Header.
+typedef struct _fss_content_t
+{
+	u32 offset;
+	u32 size;
+	u8 type;
+	u8 flags0;
+	u8 flags1;
+	u8 flags2;
+	u32 rsvd1;
+	char name[0x10];
+} fss_content_t;
+
+int parse_fss(launch_ctxt_t *ctxt, const char *path, fss0_sept_t *sept_ctxt)
+{
+	FIL fp;
+
+	bool stock = false;
+	int sept_used = 0;
+
+	if (!sept_ctxt)
+	{
+		LIST_FOREACH_ENTRY(ini_kv_t, kv, &ctxt->cfg->kvs, link)
+		{
+			if (!strcmp("stock", kv->key))
+				if (kv->val[0] == '1')
+					stock = true;
+		}
+
+		if (stock && ctxt->pkg1_id->kb <= KB_FIRMWARE_VERSION_620 && (!emu_cfg.enabled || h_cfg.emummc_force_disable))
+			return 1;
+	}
+
+	if (f_open(&fp, path, FA_READ) != FR_OK)
+		return 0;
+
+	void *fss = malloc(f_size(&fp));
+
+	// Read first 1024 bytes of the fss file.
+	f_read(&fp, fss, 1024, NULL);
+
+	// Get FSS0 Meta header offset.
+	u32 fss_meta_addr = *(u32 *)(fss + FSS0_META_OFFSET);
+	fss_meta_t *fss_meta = (fss_meta_t *)(fss + fss_meta_addr);
+
+	// Check if valid FSS0 and parse it.
+	if (fss_meta->magic == FSS0_MAGIC)
+	{
+		gfx_printf("Found FSS0, Atmosphere %d.%d.%d-%08x\n"
+			"Max HOS supported: %d.%d.%d\n"
+			"Unpacking and loading components..  ",
+			fss_meta->version >> 24, (fss_meta->version >> 16) & 0xFF, (fss_meta->version >> 8) & 0xFF, fss_meta->git_rev,
+			fss_meta->hos_ver >> 24, (fss_meta->hos_ver >> 16) & 0xFF, (fss_meta->hos_ver >> 8) & 0xFF);
+
+		if (!sept_ctxt)
+		{
+			ctxt->atmosphere = true;
+			ctxt->fss0_hosver = fss_meta->hos_ver;
+		}
+
+		// Parse FSS0 contents.
+		fss_content_t *curr_fss_cnt = (fss_content_t *)(fss + fss_meta->cnt_off);
+		void *content;
+		for (u32 i = 0; i < fss_meta->cnt_count; i++)
+		{
+			content = (void *)(fss + curr_fss_cnt[i].offset);
+
+			// Check if offset is inside limits.
+			if ((curr_fss_cnt[i].offset + curr_fss_cnt[i].size) > fss_meta->size)
+				continue;
+
+			// If content is experimental and experimental flag is not enabled, skip it.
+			if ((curr_fss_cnt[i].flags0 & CNT_FLAG0_EXPERIMENTAL) && !ctxt->fss0_enable_experimental)
+				continue;
+
+			// Parse content.
+			if (!sept_ctxt)
+			{
+				// Prepare content context.
+				switch (curr_fss_cnt[i].type)
+				{
+				case CNT_TYPE_KIP:
+					if (stock)
+						continue;
+					merge_kip_t *mkip1 = (merge_kip_t *)malloc(sizeof(merge_kip_t));
+					mkip1->kip1 = content;
+					list_append(&ctxt->kip1_list, &mkip1->link);
+					DPRINTF("Loaded %s.kip1 from FSS0 (size %08X)\n", curr_fss_cnt[i].name, curr_fss_cnt[i].size);
+					break;
+				case CNT_TYPE_EXO:
+					ctxt->secmon_size = curr_fss_cnt[i].size;
+					ctxt->secmon = content;
+					break;
+				case CNT_TYPE_WBT:
+					ctxt->warmboot_size = curr_fss_cnt[i].size;
+					ctxt->warmboot = content;
+					break;
+				default:
+					continue;
+				}
+
+				// Load content to launch context.
+				f_lseek(&fp, curr_fss_cnt[i].offset);
+				f_read(&fp, content, curr_fss_cnt[i].size, NULL);
+			}
+			else
+			{
+				// Load sept content directly to launch context.
+				switch (curr_fss_cnt[i].type)
+				{
+				case CNT_TYPE_SP1:
+					f_lseek(&fp, curr_fss_cnt[i].offset);
+					f_read(&fp, sept_ctxt->sept_primary, curr_fss_cnt[i].size, NULL);
+					break;
+				case CNT_TYPE_SP2:
+					if (!memcmp(curr_fss_cnt[i].name, (sept_ctxt->kb < KB_FIRMWARE_VERSION_810) ? "septsecondary00" : "septsecondary01", 15))
+					{
+						f_lseek(&fp, curr_fss_cnt[i].offset);
+						f_read(&fp, sept_ctxt->sept_secondary, curr_fss_cnt[i].size, NULL);
+						sept_used = 1;
+						goto out;
+					}
+					break;
+				default:
+					break;
+				}
+			}
+		}
+
+out:
+		gfx_printf("Done!\n");
+		f_close(&fp);
+
+		return (!sept_ctxt ? 1 : sept_used);
+	}
+
+	f_close(&fp);
+	free(fss);
+
+	return 0;
+}
+
+int load_sept_from_ffs0(fss0_sept_t *sept_ctxt)
+{
+	LIST_FOREACH_ENTRY(ini_kv_t, kv, &sept_ctxt->cfg_sec->kvs, link)
+	{
+		if (!strcmp("fss0", kv->key))
+			return parse_fss(NULL, kv->val, sept_ctxt);
+	}
+
+	return 0;
+}

source/hos/fss.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _FSS_H_
+#define _FSS_H_
+
+#include "hos.h"
+
+typedef struct _fss0_sept_t
+{
+	u32 kb;
+	ini_sec_t *cfg_sec;
+	void *sept_primary;
+	void *sept_secondary;
+
+} fss0_sept_t;
+
+int parse_fss(launch_ctxt_t *ctxt, const char *path, fss0_sept_t *sept_ctxt);
+int load_sept_from_ffs0(fss0_sept_t *sept_ctxt);
+
+#endif

source/hos/hos.h

@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2018 naehrwert
+ * Copyright (c) 2018-2020 CTCaer
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _HOS_H_
+#define _HOS_H_
+
+#include "pkg1.h"
+#include "pkg2.h"
+#include "../utils/types.h"
+#include "../config/ini.h"
+#include "../sec/tsec.h"
+
+#include <assert.h>
+
+#define KB_FIRMWARE_VERSION_100_200 0
+#define KB_FIRMWARE_VERSION_300 1
+#define KB_FIRMWARE_VERSION_301 2
+#define KB_FIRMWARE_VERSION_400 3
+#define KB_FIRMWARE_VERSION_500 4
+#define KB_FIRMWARE_VERSION_600 5
+#define KB_FIRMWARE_VERSION_620 6
+#define KB_FIRMWARE_VERSION_700 7
+#define KB_FIRMWARE_VERSION_810 8
+#define KB_FIRMWARE_VERSION_900 9
+#define KB_FIRMWARE_VERSION_910 10
+#define KB_FIRMWARE_VERSION_MAX KB_FIRMWARE_VERSION_910
+
+#define HOS_PKG11_MAGIC 0x31314B50
+#define HOS_EKS_MAGIC   0x30534B45
+
+typedef struct _exo_ctxt_t
+{
+	bool no_user_exceptions;
+	bool user_pmu;
+	bool *cal0_blank;
+	bool *cal0_allow_writes_sys;
+} exo_ctxt_t;
+
+typedef struct _hos_eks_keys_t
+{
+	u8 dkg[0x10];
+	u8 mkk[0x10];
+	u8 fdk[0x10];
+	u8 dkk[0x10];
+} hos_eks_keys_t;
+
+typedef struct _hos_eks_mbr_t
+{
+	u32 magic;
+	u32 enabled;
+	u32 sbk_low[2];
+	hos_eks_keys_t keys[6];
+	u32 magic2;
+	u32 rsvd2[3];
+} hos_eks_mbr_t;
+
+static_assert(sizeof(hos_eks_mbr_t) == 416, "HOS EKS storage bigger than MBR!");
+
+typedef struct _launch_ctxt_t
+{
+	void *keyblob;
+
+	void *pkg1;
+	const pkg1_id_t *pkg1_id;
+	const pkg2_kernel_id_t *pkg2_kernel_id;
+
+	void *warmboot;
+	u32   warmboot_size;
+	void *secmon;
+	u32   secmon_size;
+
+	void *pkg2;
+	u32   pkg2_size;
+	bool  new_pkg2;
+
+	void  *kernel;
+	u32    kernel_size;
+	link_t kip1_list;
+	char*  kip1_patches;
+
+	u32  fss0_hosver;
+	bool svcperm;
+	bool debugmode;
+	bool stock;
+	bool atmosphere;
+	bool fss0_enable_experimental;
+	bool emummc_forced;
+
+	exo_ctxt_t exo_cfg;
+
+	ini_sec_t *cfg;
+} launch_ctxt_t;
+
+typedef struct _merge_kip_t
+{
+	void *kip1;
+	link_t link;
+} merge_kip_t;
+
+void hos_eks_get();
+void hos_eks_save(u32 kb);
+void hos_eks_clear(u32 kb);
+int  hos_launch(ini_sec_t *cfg);
+int  hos_keygen(u8 *keyblob, u32 kb, tsec_ctxt_t *tsec_ctxt, launch_ctxt_t *hos_ctxt);
+
+#endif

source/hos/pkg2.c

@@ -26,6 +26,10 @@
 
 #include "../gfx/gfx.h"
 
+u32 pkg2_newkern_ini1_val;
+u32 pkg2_newkern_ini1_start;
+u32 pkg2_newkern_ini1_end;
+
 /*#include "util.h"
 #define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DEBUG_PRINTING*/

source/hos/pkg2.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2018 naehrwert
- * Copyright (C) 2018-2020 CTCaer
+ * Copyright (c) 2018-2020 CTCaer
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -28,9 +28,17 @@
 
 #define PKG2_NEWKERN_GET_INI1_HEURISTIC 0xD2800015 // Offset of OP + 12 is the INI1 offset.
 
-u32 pkg2_newkern_ini1_val;
+extern u32 pkg2_newkern_ini1_val;
-u32 pkg2_newkern_ini1_start;
+extern u32 pkg2_newkern_ini1_start;
-u32 pkg2_newkern_ini1_end;
+extern u32 pkg2_newkern_ini1_end;
+
+typedef struct _kernel_patch_t
+{
+	u32 id;
+	u32 off;
+	u32 val;
+	u32 *ptr;
+} kernel_patch_t;
 
 typedef struct _pkg2_hdr_t
 {
@@ -87,6 +95,12 @@ typedef struct _pkg2_kip1_info_t
 	link_t link;
 } pkg2_kip1_info_t;
 
+typedef struct _pkg2_kernel_id_t
+{
+	u8 hash[8];
+	kernel_patch_t *kernel_patchset;
+} pkg2_kernel_id_t;
+
 bool pkg2_parse_kips(link_t *info, pkg2_hdr_t *pkg2, bool *new_pkg2);
 int pkg2_decompress_kip(pkg2_kip1_info_t* ki, u32 sectsToDecomp);
 pkg2_hdr_t *pkg2_decrypt(void *data);

source/hos/sept.c

@@ -17,15 +17,20 @@
 #include <string.h>
 
 #include "sept.h"
+#include "../config/ini.h"
 #include "../gfx/di.h"
+#include "../hos/fss.h"
+#include "../hos/hos.h"
 #include "../libs/fatfs/ff.h"
 #include "../mem/heap.h"
 #include "../soc/hw_init.h"
 #include "../soc/pmc.h"
 #include "../soc/t210.h"
 #include "../storage/nx_emmc.h"
+#include "../storage/nx_sd.h"
 #include "../storage/sdmmc.h"
 #include "../utils/btn.h"
+#include "../utils/list.h"
 #include "../utils/types.h"
 
 #include "../gfx/gfx.h"
@@ -58,18 +63,50 @@ u8 warmboot_reboot[] = {
 
 extern u32 color_idx;
 extern boot_cfg_t b_cfg;
-extern void sd_unmount();
 extern void reloc_patcher(u32 payload_dst, u32 payload_src, u32 payload_size);
 
 int reboot_to_sept(const u8 *tsec_fw, const u32 tsec_size, const u32 kb)
 {
 	FIL fp;
+	bool fss0_sept_used = false;
 
 	// Copy warmboot reboot code and TSEC fw.
 	memcpy((u8 *)(SEPT_PK1T_ADDR - WB_RST_SIZE), (u8 *)warmboot_reboot, sizeof(warmboot_reboot));
 	memcpy((void *)SEPT_PK1T_ADDR, tsec_fw, tsec_size);
 	*(vu32 *)SEPT_TCSZ_ADDR = tsec_size;
 
+	LIST_INIT(ini_sections);
+	if (ini_parse(&ini_sections, "bootloader/hekate_ipl.ini", false))
+	{
+		bool found = false;
+		LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, &ini_sections, link)
+		{
+			// Only parse non config sections.
+			if (ini_sec->type == INI_CHOICE && strcmp(ini_sec->name, "config"))
+			{
+				LIST_FOREACH_ENTRY(ini_kv_t, kv, &ini_sec->kvs, link)
+				{
+					if (!strcmp("fss0", kv->key))
+					{
+						fss0_sept_t sept_ctxt;
+						sept_ctxt.kb = kb;
+						sept_ctxt.sept_primary = (void *)SEPT_STG1_ADDR;
+						sept_ctxt.sept_secondary = (void *)SEPT_STG2_ADDR;
+						fss0_sept_used = parse_fss(NULL, kv->val, &sept_ctxt);
+
+						found = true;
+						break;
+					}
+				}
+			}
+			if (found)
+				break;
+		}
+	}
+
+
+	if (!fss0_sept_used)
+	{
 		// Copy sept-primary.
 		if (f_open(&fp, "sd:/sept/sept-primary.bin", FA_READ))
 			goto error;
@@ -100,6 +137,7 @@ int reboot_to_sept(const u8 *tsec_fw, const u32 tsec_size, const u32 kb)
 			goto error;
 		}
 		f_close(&fp);
+	}
 
 	// Save auto boot config to sept payload, if any.
 	boot_cfg_t *tmp_cfg = malloc(sizeof(boot_cfg_t));
@@ -107,7 +145,8 @@ int reboot_to_sept(const u8 *tsec_fw, const u32 tsec_size, const u32 kb)
 
 	tmp_cfg->boot_cfg |= BOOT_CFG_SEPT_RUN;
 
-	if (f_open(&fp, "sd:/sept/payload.bin", FA_READ | FA_WRITE)) {
+	if (f_open(&fp, "sd:/sept/payload.bin", FA_READ | FA_WRITE))
+	{
 		free(tmp_cfg);
 		goto error;
 	}

source/libs/fatfs/diskio.c

@@ -81,8 +81,10 @@ static inline void _gf256_mul_x_le(void *block) {
 
 static inline int _emmc_xts(u32 ks1, u32 ks2, u32 enc, u8 *tweak, bool regen_tweak, u32 tweak_exp, u64 sec, void *dst, void *src, u32 secsize) {
     int res = 0;
-    u8 *pdst = (u8 *)dst;
+    u8 *temptweak = (u8 *)malloc(0x10);
-    u8 *psrc = (u8 *)src;
+	u32 *pdst = (u32 *)dst;
+    u32 *psrc = (u32 *)src;
+    u32 *ptweak = (u32 *)tweak;
 
     if (regen_tweak) {
         for (int i = 0xF; i >= 0; i--) {
@@ -96,34 +98,33 @@ static inline int _emmc_xts(u32 ks1, u32 ks2, u32 enc, u8 *tweak, bool regen_twe
     for (u32 i = 0; i < tweak_exp * 0x20; i++)
         _gf256_mul_x_le(tweak);
 
-    u8 temptweak[0x10];
     memcpy(temptweak, tweak, 0x10);
 
     //We are assuming a 0x10-aligned sector size in this implementation.
     for (u32 i = 0; i < secsize / 0x10; i++) {
-        for (u32 j = 0; j < 0x10; j++)
+        for (u32 j = 0; j < 4; j++)
-            pdst[j] = psrc[j] ^ tweak[j];
+            pdst[j] = psrc[j] ^ ptweak[j];
         _gf256_mul_x_le(tweak);
-        psrc += 0x10;
+        psrc += 4;
-        pdst += 0x10;
+        pdst += 4;
     }
 
-    se_aes_crypt_ecb(ks2, enc, dst, secsize, src, secsize);
+    se_aes_crypt_ecb(ks2, enc, dst, secsize, dst, secsize);
 
-    pdst = (u8 *)dst;
+    pdst = (u32 *)dst;
 
     memcpy(tweak, temptweak, 0x10);
     for (u32 i = 0; i < secsize / 0x10; i++) {
-        for (u32 j = 0; j < 0x10; j++)
+        for (u32 j = 0; j < 4; j++)
-            pdst[j] = pdst[j] ^ tweak[j];
+            pdst[j] = pdst[j] ^ ptweak[j];
         _gf256_mul_x_le(tweak);
-        pdst += 0x10;
+        pdst += 4;
     }
 
-
     res = 1;
 
 out:;
+    free(temptweak);
     return res;
 }
 

source/libs/fatfs/ff.c

@@ -42,8 +42,8 @@
 #include "../../storage/sdmmc.h"
 extern sdmmc_storage_t sd_storage;
 
-#define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
+//#define EFSPRINTF(text, ...) print_error(); gfx_printf("%k"text"%k\n", 0xFFFFFF00, 0xFFFFFFFF);
-//#define EFSPRINTF(...)
+#define EFSPRINTF(...)
 
 /*--------------------------------------------------------------------------
 
@@ -6114,9 +6114,6 @@ FRESULT f_fdisk (
 	DWORD sz_disk, p_sect, b_cyl, b_sect;
 	FRESULT res;
 
-	BYTE *empty_buff;
-	empty_buff = ff_memcalloc(sizeof(BYTE), 16384);
-
 	stat = disk_initialize(pdrv);
 	if (stat & STA_NOINIT) return FR_NOT_READY;
 	if (stat & STA_PROTECT) return FR_WRITE_PROTECTED;
@@ -6169,14 +6166,14 @@ FRESULT f_fdisk (
 		st_dword(p + 8, b_sect);			/* Start sector in LBA */
 		st_dword(p + 12, p_sect);			/* Number of sectors */
 		/* Next partition */
-		b_sect += p_sect;
 
-		for (int cursect = 0; cursect < 1024; cursect++){
+		for (u32 cursect = 0; cursect < 512; cursect++){
-			disk_write(pdrv, empty_buff, b_sect + (32 * cursect), 32);
+			disk_write(pdrv, buf + 0x4000, b_sect + (64 * cursect), 64);
 		}
+
+		b_sect += p_sect;
 	}
 	st_word(p, 0xAA55);		/* MBR signature (always at offset 510) */
-	ff_memfree(empty_buff);
 
 	/* Write it to the MBR */
 	res = (disk_write(pdrv, buf, 0, 1) == RES_OK && disk_ioctl(pdrv, CTRL_SYNC, 0) == RES_OK) ? FR_OK : FR_DISK_ERR;

source/main.c

@@ -44,10 +44,10 @@
 
 //#include "keys/keys.h"
 
-sdmmc_t sd_sdmmc;
+//sdmmc_t sd_sdmmc;
-sdmmc_storage_t sd_storage;
+//sdmmc_storage_t sd_storage;
-__attribute__ ((aligned (16))) FATFS sd_fs;
+//__attribute__ ((aligned (16))) FATFS sd_fs;
-bool sd_mounted, sd_inited;
+//bool sd_mounted, sd_inited;
 volatile nyx_storage_t *nyx_str = (nyx_storage_t *)NYX_STORAGE_ADDR;
 hekate_config h_cfg;
 boot_cfg_t __attribute__((section ("._boot_cfg"))) b_cfg;

source/mem/heap.c

@@ -136,7 +136,7 @@ void *malloc(u32 size)
 void *calloc(u32 num, u32 size)
 {
 	void *res = (void *)_heap_alloc(&_heap, num * size);
-	memset(res, 0, num * size);
+	memset(res, 0, ALIGN(num * size, sizeof(hnode_t))); // Clear the aligned size.
 	return res;
 }
 

source/mem/minerva.c

@@ -27,6 +27,7 @@
 #include "../soc/t210.h"
 
 extern volatile nyx_storage_t *nyx_str;
+void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
 
 u32 minerva_init()
 {

source/mem/minerva.h

@@ -57,7 +57,7 @@ typedef enum
 	FREQ_1600 = 1600000
 } minerva_freq_t;
 
-void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
+extern void (*minerva_cfg)(mtc_config_t *mtc_cfg, void *);
 u32  minerva_init();
 void minerva_change_freq(minerva_freq_t freq);
 void minerva_periodic_training();

source/rtc/max77620-rtc.c

@@ -2,7 +2,7 @@
  * PMIC Real Time Clock driver for Nintendo Switch's MAX77620-RTC
  *
  * Copyright (c) 2018-2019 CTCaer
- * Copyright (c) 2019 shchmue
+ * Copyright (c) 2019-2020 shchmue
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -35,10 +35,10 @@ void max77620_rtc_get_time(rtc_time_t *time)
 	// Get time.
 	time->sec  = i2c_recv_byte(I2C_5, MAX77620_RTC_I2C_ADDR, MAX77620_RTC_SEC_REG) & 0x7F;
 	time->min  = i2c_recv_byte(I2C_5, MAX77620_RTC_I2C_ADDR, MAX77620_RTC_MIN_REG) & 0x7F;
-	u8 hour = i2c_recv_byte(I2C_5, MAX77620_RTC_I2C_ADDR, MAX77620_RTC_HOUR_REG);
-	time->hour = hour & 0x1F;
 
-	if (!(val & MAX77620_RTC_24H) && (hour & MAX77620_RTC_HOUR_PM_MASK))
+	time->hour = i2c_recv_byte(I2C_5, MAX77620_RTC_I2C_ADDR, MAX77620_RTC_HOUR_REG) & 0x1F;
+
+	if (!(val & MAX77620_RTC_24H) && time->hour & MAX77620_RTC_HOUR_PM_MASK)
 		time->hour = (time->hour & 0xF) + 12;
 
 	// Get day of week. 1: Monday to 7: Sunday.

source/sec/se.c

@@ -19,6 +19,7 @@
 
 #include <string.h>
 
+#include "../../common/memory_map.h"
 #include "../sec/se.h"
 #include "../mem/heap.h"
 #include "../soc/bpmp.h"
@@ -94,7 +95,12 @@ static int _se_wait()
 
 static int _se_execute(u32 op, void *dst, u32 dst_size, const void *src, u32 src_size)
 {
-	se_ll_t *ll_dst = (se_ll_t *)0xECFFFFE0, *ll_src = (se_ll_t *)0xECFFFFF0;
+	static se_ll_t *ll_dst = NULL, *ll_src = NULL;
+	if (!ll_dst)
+	{
+		ll_dst = (se_ll_t *)malloc(sizeof(se_ll_t));
+		ll_src = (se_ll_t *)malloc(sizeof(se_ll_t));
+	}
 
 	if (dst)
 	{
@@ -234,6 +240,16 @@ void se_aes_key_set(u32 ks, const void *key, u32 size)
 	}
 }
 
+void se_aes_iv_set(u32 ks, const void *iv, u32 size)
+{
+	u32 *data = (u32 *)iv;
+	for (u32 i = 0; i < size / 4; i++)
+	{
+		SE(SE_KEYTABLE_REG_OFFSET) = SE_KEYTABLE_SLOT(ks) | 8 | i;
+		SE(SE_KEYTABLE_DATA0_REG_OFFSET) = data[i];
+	}
+}
+
 void se_aes_key_read(u32 ks, void *key, u32 size)
 {
 	u32 *data = (u32 *)key;
@@ -320,12 +336,90 @@ int se_aes_crypt_ctr(u32 ks, void *dst, u32 dst_size, const void *src, u32 src_s
 	return 1;
 }
 
+// random calls were derived from Atmosphère's
+int se_initialize_rng(u32 ks)
+{
+	u8 *output_buf = (u8 *)malloc(0x10);
+
+	SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_ENC_ALG(ALG_RNG) | SE_CONFIG_DST(DST_MEMORY);
+	SE(SE_CRYPTO_REG_OFFSET) = SE_CRYPTO_KEY_INDEX(ks) | SE_CRYPTO_CORE_SEL(CORE_ENCRYPT) |
+		SE_CRYPTO_INPUT_SEL(INPUT_RANDOM);
+	SE(SE_RNG_CONFIG_REG_OFFSET) = SE_RNG_CONFIG_MODE(RNG_MODE_FORCE_INSTANTION) | SE_RNG_CONFIG_SRC(RNG_SRC_ENTROPY);
+	SE(SE_RNG_RESEED_INTERVAL_REG_OFFSET) = 70001;
+	SE(SE_RNG_SRC_CONFIG_REG_OFFSET) = SE_RNG_SRC_CONFIG_ENT_SRC_LOCK(RNG_SRC_RO_ENT_LOCK_ENABLE);
+	SE(SE_BLOCK_COUNT_REG_OFFSET) = 0;
+
+	int res =_se_execute(OP_START, output_buf, 0x10, NULL, 0);
+
+	free(output_buf);
+	return res;
+}
+
+int se_generate_random(u32 ks, void *dst, u32 size)
+{
+	SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_ENC_ALG(ALG_RNG) | SE_CONFIG_DST(DST_MEMORY);
+	SE(SE_CRYPTO_REG_OFFSET) = SE_CRYPTO_KEY_INDEX(ks) | SE_CRYPTO_CORE_SEL(CORE_ENCRYPT) |
+		SE_CRYPTO_INPUT_SEL(INPUT_RANDOM);
+	SE(SE_RNG_CONFIG_REG_OFFSET) = SE_RNG_CONFIG_MODE(RNG_MODE_NORMAL) | SE_RNG_CONFIG_SRC(RNG_SRC_ENTROPY);
+
+	u32 num_blocks = size >> 4;
+	u32 aligned_size = num_blocks << 4;
+	if (num_blocks)
+	{
+		SE(SE_BLOCK_COUNT_REG_OFFSET) = num_blocks - 1;
+		if (!_se_execute(OP_START, dst, aligned_size, NULL, 0))
+			return 0;
+	}
+	if (size > aligned_size)
+		return _se_execute_one_block(OP_START, dst + aligned_size, size - aligned_size, NULL, 0);
+	return 1;
+}
+
+int se_generate_random_key(u32 ks_dst, u32 ks_src)
+{
+	SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_ENC_ALG(ALG_RNG) | SE_CONFIG_DST(DST_MEMORY);
+	SE(SE_CRYPTO_REG_OFFSET) = SE_CRYPTO_KEY_INDEX(ks_src) | SE_CRYPTO_CORE_SEL(CORE_ENCRYPT) |
+		SE_CRYPTO_INPUT_SEL(INPUT_RANDOM);
+	SE(SE_RNG_CONFIG_REG_OFFSET) = SE_RNG_CONFIG_MODE(RNG_MODE_NORMAL) | SE_RNG_CONFIG_SRC(RNG_SRC_ENTROPY);
+
+	SE(SE_CRYPTO_KEYTABLE_DST_REG_OFFSET) = SE_CRYPTO_KEYTABLE_DST_KEY_INDEX(ks_dst);
+	if (!_se_execute(OP_START, NULL, 0, NULL, 0))
+		return 0;
+	SE(SE_CRYPTO_KEYTABLE_DST_REG_OFFSET) = SE_CRYPTO_KEYTABLE_DST_KEY_INDEX(ks_dst) | 1;
+	if (!_se_execute(OP_START, NULL, 0, NULL, 0))
+		return 0;
+
+	return 1;
+}
+
+int se_aes_crypt_cbc(u32 ks, u32 enc, void *dst, u32 dst_size, const void *src, u32 src_size)
+{
+	if (enc)
+	{
+		SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_ENC_ALG(ALG_AES_ENC) | SE_CONFIG_DST(DST_MEMORY);
+		SE(SE_CRYPTO_REG_OFFSET) = SE_CRYPTO_KEY_INDEX(ks) | SE_CRYPTO_VCTRAM_SEL(VCTRAM_AESOUT) |
+			SE_CRYPTO_CORE_SEL(CORE_ENCRYPT) | SE_CRYPTO_XOR_POS(XOR_TOP) | SE_CRYPTO_INPUT_SEL(INPUT_AHB) |
+			SE_CRYPTO_IV_SEL(IV_ORIGINAL);
+	}
+	else
+	{
+		SE(SE_CONFIG_REG_OFFSET) = SE_CONFIG_DEC_ALG(ALG_AES_DEC) | SE_CONFIG_DST(DST_MEMORY);
+		SE(SE_CRYPTO_REG_OFFSET) = SE_CRYPTO_KEY_INDEX(ks) | SE_CRYPTO_VCTRAM_SEL(VCTRAM_PREVAHB) |
+			SE_CRYPTO_CORE_SEL(CORE_DECRYPT) | SE_CRYPTO_XOR_POS(XOR_BOTTOM) | SE_CRYPTO_INPUT_SEL(INPUT_AHB) |
+			SE_CRYPTO_IV_SEL(IV_ORIGINAL);
+	}
+	SE(SE_BLOCK_COUNT_REG_OFFSET) = (src_size >> 4) - 1;
+	return _se_execute(OP_START, dst, dst_size, src, src_size);
+}
+
 int se_aes_xts_crypt_sec(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, const void *src, u32 secsize)
 {
 	int res = 0;
 	u8 *tweak = (u8 *)malloc(0x10);
-	u8 *pdst = (u8 *)dst;
+	u8 *temptweak = (u8 *)malloc(0x10);
-	u8 *psrc = (u8 *)src;
+	u32 *pdst = (u32 *)dst;
+    u32 *psrc = (u32 *)src;
+    u32 *ptweak = (u32 *)tweak;
 
 	//Generate tweak.
 	for (int i = 0xF; i >= 0; i--)
@@ -336,23 +430,35 @@ int se_aes_xts_crypt_sec(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, const vo
 	if (!se_aes_crypt_block_ecb(ks1, 1, tweak, tweak))
 		goto out;
 
+	memcpy(temptweak, tweak, 0x10);
+
 	//We are assuming a 0x10-aligned sector size in this implementation.
 	for (u32 i = 0; i < secsize / 0x10; i++)
 	{
-		for (u32 j = 0; j < 0x10; j++)
+		for (u32 j = 0; j < 4; j++)
-			pdst[j] = psrc[j] ^ tweak[j];
+			pdst[j] = psrc[j] ^ ptweak[j];
-		if (!se_aes_crypt_block_ecb(ks2, enc, pdst, pdst))
-			goto out;
-		for (u32 j = 0; j < 0x10; j++)
-			pdst[j] = pdst[j] ^ tweak[j];
 		_gf256_mul_x_le(tweak);
-		psrc += 0x10;
+		psrc += 4;
-		pdst += 0x10;
+		pdst += 4;
+	}
+
+	se_aes_crypt_ecb(ks2, enc, dst, secsize, dst, secsize);
+
+	pdst = (u32 *)dst;
+
+	memcpy(tweak, temptweak, 0x10);
+	for (u32 i = 0; i < secsize / 0x10; i++)
+	{
+		for (u32 j = 0; j < 4; j++)
+			pdst[j] = pdst[j] ^ ptweak[j];
+		_gf256_mul_x_le(tweak);
+		pdst += 4;
 	}
 
 	res = 1;
 
 out:;
+	free(temptweak);
 	free(tweak);
 	return res;
 }
@@ -390,17 +496,21 @@ int se_aes_cmac(u32 ks, void *dst, u32 dst_size, const void *src, u32 src_size)
 	se_aes_key_iv_clear(ks);
 
 	u32 num_blocks = (src_size + 0xf) >> 4;
-	if (num_blocks > 1) {
+	if (num_blocks > 1)
+	{
 		SE(SE_BLOCK_COUNT_REG_OFFSET) = num_blocks - 2;
 		if (!_se_execute(OP_START, NULL, 0, src, src_size))
 			goto out;
 		SE(SE_CRYPTO_REG_OFFSET) |= SE_CRYPTO_IV_SEL(IV_UPDATED);
 	}
 
-	if (src_size & 0xf) {
+	if (src_size & 0xf)
+	{
 		memcpy(last_block, src + (src_size & ~0xf), src_size & 0xf);
 		last_block[src_size & 0xf] = 0x80;
-	} else if (src_size >= 0x10) {
+	}
+	else if (src_size >= 0x10)
+	{
 		memcpy(last_block, src + src_size - 0x10, 0x10);
 	}
 
@@ -447,7 +557,8 @@ int se_calc_sha256(void *dst, const void *src, u32 src_size)
 	return res;
 }
 
-int se_calc_hmac_sha256(void *dst, const void *src, u32 src_size, const void *key, u32 key_size) {
+int se_calc_hmac_sha256(void *dst, const void *src, u32 src_size, const void *key, u32 key_size)
+{
 	int res = 0;
 	u8 *secret = (u8 *)malloc(0x40);
 	u8 *ipad = (u8 *)malloc(0x40 + src_size);

source/sec/se.h

@@ -25,12 +25,17 @@ void se_rsa_key_clear(u32 ks);
 int se_rsa_exp_mod(u32 ks, void *dst, u32 dst_size, const void *src, u32 src_size);
 void se_key_acc_ctrl(u32 ks, u32 flags);
 void se_aes_key_set(u32 ks, const void *key, u32 size);
+void se_aes_iv_set(u32 ks, const void *iv, u32 size);
 void se_aes_key_read(u32 ks, void *key, u32 size);
 void se_aes_key_clear(u32 ks);
+int se_initialize_rng(u32 ks);
+int se_generate_random(u32 ks, void *dst, u32 size);
+int se_generate_random_key(u32 ks_dst, u32 ks_src);
 int se_aes_unwrap_key(u32 ks_dst, u32 ks_src, const void *input);
 int se_aes_crypt_ecb(u32 ks, u32 enc, void *dst, u32 dst_size, const void *src, u32 src_size);
 int se_aes_crypt_block_ecb(u32 ks, u32 enc, void *dst, const void *src);
 int se_aes_crypt_ctr(u32 ks, void *dst, u32 dst_size, const void *src, u32 src_size, void *ctr);
+int se_aes_crypt_cbc(u32 ks, u32 enc, void *dst, u32 dst_size, const void *src, u32 src_size);
 int se_aes_xts_crypt_sec(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, const void *src, u32 secsize);
 int se_aes_xts_crypt(u32 ks1, u32 ks2, u32 enc, u64 sec, void *dst, const void *src, u32 secsize, u32 num_secs);
 int se_aes_cmac(u32 ks, void *dst, u32 dst_size, const void *src, u32 src_size);

source/sec/tsec.c

@@ -18,6 +18,7 @@
 
 #include <string.h>
 
+#include "../hos/hos.h"
 #include "../sec/tsec.h"
 #include "../sec/tsec_t210.h"
 #include "../sec/se_t210.h"
@@ -126,7 +127,7 @@ int tsec_query(u8 *tsec_keys, u8 kb, tsec_ctxt_t *tsec_ctxt)
 	{
 		// Init SMMU translation for TSEC.
 		pdir = smmu_init_for_tsec();
-		smmu_init(tsec_ctxt->secmon_base);
+		smmu_init(0x4002B000);
 		// Enable SMMU
 		if (!smmu_is_used())
 			smmu_enable();
@@ -169,7 +170,7 @@ int tsec_query(u8 *tsec_keys, u8 kb, tsec_ctxt_t *tsec_ctxt)
 		iram = page_alloc(0x30);
 		memcpy(iram, tsec_ctxt->pkg1, 0x30000);
 		// PKG1.1 magic offset.
-		pkg11_magic_off = (u32 *)(iram + ((tsec_ctxt->pkg11_off + 0x20) / 4));
+		pkg11_magic_off = (u32 *)(iram + (0x7000 / 4));
 		smmu_map(pdir, 0x40010000, (u32)iram, 0x30, _READABLE | _WRITABLE | _NONSECURE);
 
 		// Exception vectors

source/sec/tsec.h

@@ -27,8 +27,6 @@ typedef struct _tsec_ctxt_t
 	void *fw;
 	u32 size;
 	void *pkg1;
-	u32 pkg11_off;
-	u32 secmon_base;
 } tsec_ctxt_t;
 
 typedef struct _tsec_key_data_t

source/soc/hw_init.c

@@ -26,7 +26,6 @@
 #include "pinmux.h"
 #include "pmc.h"
 #include "t210.h"
-#include "uart.h"
 #include "../gfx/di.h"
 #include "../mem/mc.h"
 #include "../mem/minerva.h"
@@ -102,7 +101,7 @@ void _config_gpios()
 
 	pinmux_config_i2c(I2C_1);
 	pinmux_config_i2c(I2C_5);
-	pinmux_config_uart(UART_A);
+	pinmux_config_uart(0);
 
 	// Configure volume up/down as inputs.
 	gpio_config(GPIO_PORT_X, GPIO_PIN_6, GPIO_MODE_GPIO);
@@ -295,11 +294,6 @@ void config_hw()
 	APB_MISC(APB_MISC_PP_PINMUX_GLOBAL) = 0;
 	_config_gpios();
 
-#ifdef DEBUG_UART_PORT
-	clock_enable_uart(DEBUG_UART_PORT);
-	uart_init(DEBUG_UART_PORT, 115200);
-#endif
-
 	clock_enable_cl_dvfs();
 
 	clock_enable_i2c(I2C_1);
@@ -319,6 +313,7 @@ void config_hw()
 	sdram_init();
 
 	bpmp_mmu_enable();
+	mc_enable_ahb_redirect();
 
 	// Clear flags from PMC_SCRATCH0
 	PMC(APBDEV_PMC_SCRATCH0) &= ~PMC_SCRATCH0_MODE_PAYLOAD;
@@ -357,7 +352,7 @@ void reconfig_hw_workaround(bool extra_reconfig, u32 magic)
 	if (magic == 0xBAADF00D)
 	{
 		CLOCK(CLK_RST_CONTROLLER_CLK_OUT_ENB_L) |= (1 << 22);
-		sdmmc_init(&sd_sdmmc, SDMMC_1, SDMMC_POWER_3_3, SDMMC_BUS_WIDTH_1, SDHCI_TIMING_SD_ID, 0);
+		sdmmc_init(&sd_sdmmc, SDMMC_1, SDMMC_POWER_3_3, SDMMC_BUS_WIDTH_1, 5, 0);
 		clock_disable_cl_dvfs();
 
 		msleep(200);

source/storage/emummc.c

@@ -32,6 +32,7 @@ extern sdmmc_storage_t sd_storage;
 extern FATFS sd_fs;
 
 extern hekate_config h_cfg;
+emummc_cfg_t emu_cfg;
 
 extern bool sd_mount();
 extern void sd_unmount();

source/storage/emummc.h

@@ -47,7 +47,7 @@ typedef struct _emummc_cfg_t
 	int fs_ver;
 } emummc_cfg_t;
 
-emummc_cfg_t emu_cfg;
+extern emummc_cfg_t emu_cfg;
 
 bool emummc_load_cfg();
 int emummc_storage_init_mmc(sdmmc_storage_t *storage, sdmmc_t *sdmmc);

source/storage/nx_sd.c

@@ -25,6 +25,10 @@
 bool sd_mounted = false, sd_inited = false;
 static u32  sd_mode = SD_UHS_SDR82;
 
+sdmmc_t sd_sdmmc;
+sdmmc_storage_t sd_storage;
+FATFS sd_fs;
+
 u32 sd_get_mode()
 {
 	return sd_mode;

source/storage/nx_sd.h

@@ -30,9 +30,9 @@ enum
 	SD_UHS_SDR82  = 3,
 };
 
-sdmmc_t sd_sdmmc;
+extern sdmmc_t sd_sdmmc;
-sdmmc_storage_t sd_storage;
+extern sdmmc_storage_t sd_storage;
-FATFS sd_fs;
+extern FATFS sd_fs;
 
 u32  sd_get_mode();
 int  sd_init_retry(bool power_cycle);

source/storage/sdmmc.h

@@ -21,7 +21,7 @@
 #include "../utils/types.h"
 #include "sdmmc_driver.h"
 
-u32 sd_power_cycle_time_start;
+extern u32 sd_power_cycle_time_start;
 
 typedef enum _sdmmc_type
 {

source/storage/sdmmc_driver.c

@@ -29,6 +29,11 @@
 #include "../soc/t210.h"
 #include "../utils/util.h"
 
+#pragma GCC push_options
+#pragma GCC optimize ("Os")
+
+u32 sd_power_cycle_time_start;
+
 //#define DPRINTF(...) gfx_printf(__VA_ARGS__)
 #define DPRINTF(...)
 
@@ -1158,6 +1163,8 @@ int sdmmc_init(sdmmc_t *sdmmc, u32 id, u32 power, u32 bus_width, u32 type, int a
 	return 0;
 }
 
+#pragma GCC pop_options
+
 void sdmmc_end(sdmmc_t *sdmmc)
 {
 	if (!sdmmc->clock_stopped)

source/tegraexplorer/common/common.h

@@ -21,9 +21,11 @@ enum utils_err_codes_te_call {
     ERR_EMMC_WRITE_FAILED,
     ERR_FILE_TOO_BIG_FOR_DEST,
     ERR_SD_EJECTED,
-    ERR_PARSE_FAIL,
+    ERR_SCRIPT_LOOKUP_FAIL,
     ERR_CANNOT_COPY_FILE_TO_FS_PART,
-    ERR_NO_DESTINATION
+    ERR_NO_DESTINATION,
+    ERR_INI_PARSE_FAIL,
+    ERR_IN_FUNC
 };
 
 extern const char *utils_err_codes_te[];
@@ -58,8 +60,7 @@ extern menu_entry mainmenu_shutdown[];
 enum mainmenu_tools_return {
     TOOLS_DISPLAY_INFO = 1,
     TOOLS_DISPLAY_GPIO,
-    TOOLS_DUMPFIRMWARE,
+    TOOLS_DUMPFIRMWARE
-    TOOLS_DUMPUSERSAVE
 };
 
 extern menu_entry mainmenu_tools[];
@@ -86,7 +87,8 @@ enum fs_menu_file_return {
     FILE_PAYLOAD,
     FILE_SCRIPT,
     FILE_HEXVIEW,
-    FILE_DUMPBIS
+    FILE_DUMPBIS,
+    FILE_SIGN
 };
 
 extern menu_entry fs_menu_file[];
@@ -114,3 +116,5 @@ extern gpt_entry_rule gpt_fs_rules[];
 extern menu_entry mmcmenu_start[];
 
 extern menu_entry mmcmenu_filemenu[];
+
+extern menu_entry fwDump_typeMenu[];

source/tegraexplorer/common/strings.c

@@ -50,9 +50,11 @@ const char *utils_err_codes_te[] = { // these start at 50
     "EMMC WRITE FAILED",
     "FILE TOO BIG FOR DEST",
     "SD EJECTED",
-    "PARSING FAILED",
+    "FUNC LOOKUP FAIL",
     "CANNOT COPY FILE TO FS PART",
-    "NO DESTINATION"
+    "NO DESTINATION",
+    "INI PARSE FAIL",
+    "ERR IN FUNC"
 };
 /*
 const char *pkg2names[] = {

source/tegraexplorer/common/structs.c

@@ -25,8 +25,7 @@ menu_entry mainmenu_tools[] = {
     {"Back", COLOR_WHITE, {ISMENU}},
     {"\nDisplay Console Info", COLOR_GREEN, {ISMENU}},
     {"Display GPIO pins", COLOR_VIOLET, {ISMENU}},
-    {"Dump Firmware", COLOR_BLUE, {ISMENU}},
+    {"Dump Firmware", COLOR_BLUE, {ISMENU}}
-    {"Dump User Saves", COLOR_YELLOW, {ISMENU}}
 };
 
 menu_entry mainmenu_format[] = {
@@ -53,7 +52,8 @@ menu_entry fs_menu_file[] = {
     {"Launch Payload", COLOR_ORANGE, {ISMENU}},
     {"Launch Script", COLOR_YELLOW, {ISMENU}},
     {"View Hex", COLOR_GREEN, {ISMENU}},
-    {"\nExtract BIS", COLOR_YELLOW, {ISMENU}}
+    {"\nExtract BIS", COLOR_YELLOW, {ISMENU}},
+    {"Sign Save", COLOR_ORANGE, {ISMENU}}
 };
 
 menu_entry fs_menu_folder[] = {
@@ -93,3 +93,10 @@ menu_entry mmcmenu_filemenu[] = {
     {"\nBack", COLOR_WHITE, {ISMENU}},
     {"Dump to SD", COLOR_YELLOW, {ISMENU}}
 };
+
+menu_entry fwDump_typeMenu[] = {
+	{"Back\n", COLOR_WHITE, {ISMENU}},
+	{"Firmware format type:", COLOR_WHITE, {ISMENU | ISSKIP}},
+	{"Daybreak (prod.keys required!)", COLOR_BLUE, {ISMENU}},
+	{"ChoiNX", COLOR_VIOLET, {ISMENU}}
+};

source/tegraexplorer/common/types.h

@@ -59,3 +59,5 @@ typedef struct {
 
 #define isFS 0x80
 #define isBOOT 0x2
+
+typedef void (*func_void_ptr)();

source/tegraexplorer/emmc/emmc.c

@@ -219,9 +219,6 @@ int dump_biskeys(){
     //nx_emmc_gpt_parse(&sys_gpt, &storage);
     
     
-    se_aes_key_set(8, bis_key[2] + 0x00, 0x10);
-    se_aes_key_set(9, bis_key[2] + 0x10, 0x10);
-    
     pkg1inf.ver = pkg1_id->kb;
     strcpy(pkg1inf.id, pkg1_id->id);
     return 0;

source/tegraexplorer/emmc/emmcmenu.c

@@ -28,6 +28,7 @@ extern sdmmc_storage_t storage;
 extern emmc_part_t *system_part;
 extern char *clipboard;
 extern u8 clipboardhelper;
+extern bool sd_mounted;
 
 
 void addEntry(emmc_part_t *part, u8 property_GPT, int spot){
@@ -73,6 +74,12 @@ int fillMmcMenu(short mmcType){
 
     mu_createObjects(count, &mmcMenuEntries);
 
+    if (!sd_mounted)
+      sd_mount();
+
+    SETBIT(mmcmenu_filemenu[3].property, ISHIDE, !sd_mounted);
+    SETBIT(mmcmenu_start[1].property, ISHIDE, !sd_mounted);
+
     for (i = 0; i < 4; i++)
         mu_copySingle(mmcmenu_start[i].name, mmcmenu_start[i].storage, mmcmenu_start[i].property, &mmcMenuEntries[i]);
 
@@ -159,7 +166,7 @@ int makeMmcMenu(short mmcType){
             case 2:
                 if (!(clipboardhelper & ISDIR) && (clipboardhelper & OPERATIONCOPY)){
                     gfx_clearscreen();
-                    if (!mmcFlashFile(clipboard, mmcType)){
+                    if (!mmcFlashFile(clipboard, mmcType, true)){
                         gfx_printf("\nDone!");
                         hidWait();
                     }

source/tegraexplorer/emmc/emmcoperations.h

@@ -4,7 +4,7 @@
 
 int emmcDumpSpecific(char *part, char *path);
 int emmcDumpBoot(char *basePath);
-int mmcFlashFile(char *path, short mmcType);
+int mmcFlashFile(char *path, short mmcType, bool warnings);
 
 int emmcDumpPart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part);
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings);

source/tegraexplorer/emmc/emmcrestorepart.c

@@ -17,7 +17,7 @@
 extern sdmmc_storage_t storage;
 extern emmc_part_t *system_part;
 
-int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
+int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part, bool warnings){
     FIL fp;
     FILINFO fno;
     u8 *buf;
@@ -54,10 +54,10 @@ int emmcRestorePart(char *path, sdmmc_storage_t *mmcstorage, emmc_part_t *part){
 
     gfx_printf("Flashing %s\n", part->name);
 
-    if (totalSize < totalSizeDest){
+    if (totalSize < totalSizeDest && warnings){
         SWAPCOLOR(COLOR_ORANGE);
         gfx_printf("File is too small for destination.\nDo you want to flash it anyway?\n\nB to Cancel\n");
-        u8 btnres = gfx_makewaitmenu(
+        u32 btnres = gfx_makewaitmenu(
             "A to Confirm",
             3
         );
@@ -214,13 +214,13 @@ emmc_part_t *mmcFindPart(char *path, short mmcType){
     return NULL;
 }
 
-int mmcFlashFile(char *path, short mmcType){
+int mmcFlashFile(char *path, short mmcType, bool warnings){
     emmc_part_t *part;
     int res;
 
     part = mmcFindPart(path, mmcType);
     if (part != NULL){
-        res = emmcRestorePart(path, &storage, part);
+        res = emmcRestorePart(path, &storage, part, warnings);
         emummc_storage_set_mmc_partition(&storage, 0);
         return res;
     }

source/tegraexplorer/fs/filemenu.c

@@ -16,6 +16,7 @@
 #include "../emmc/emmcoperations.h"
 #include "../../hid/hid.h"
 #include "../utils/menuUtils.h"
+#include "savesign.h"
 
 extern char *currentpath;
 extern char *clipboard;
@@ -150,6 +151,7 @@ int filemenu(menu_entry file){
     fs_menu_file[8].isHide = (!(strstr(file.name, ".bin") != NULL && file.size == 1) && strstr(file.name, ".rom") == NULL);
     fs_menu_file[9].isHide = (strstr(file.name, ".te") == NULL);
     fs_menu_file[11].isHide = (strstr(file.name, ".bis") == NULL);
+    fs_menu_file[12].isHide = (!!strcmp(currentpath, "emmc:/save"));
 
     /*
     SETBIT(fs_menu_file[6].property, ISHIDE, !hidConnected());
@@ -158,7 +160,7 @@ int filemenu(menu_entry file){
     SETBIT(fs_menu_file[11].property, ISHIDE, strstr(file.name, ".bis") == NULL);
     */
 
-    temp = menu_make(fs_menu_file, 12, "-- File Menu --");
+    temp = menu_make(fs_menu_file, 13, "-- File Menu --");
     switch (temp){
         case FILE_COPY:
             fsreader_writeclipboard(fsutil_getnextloc(currentpath, file.name), OPERATIONCOPY);
@@ -202,7 +204,7 @@ int filemenu(menu_entry file){
             while (hidRead()->buttons);
             */
 
-            runScript(fsutil_getnextloc(currentpath, file.name));
+            startScript(fsutil_getnextloc(currentpath, file.name));
             fsreader_readfolder(currentpath);
             break;
         case FILE_HEXVIEW:
@@ -213,6 +215,17 @@ int filemenu(menu_entry file){
             extract_bis_file(fsutil_getnextloc(currentpath, file.name), currentpath);
             fsreader_readfolder(currentpath);
             hidWait();
+            break;
+        case FILE_SIGN:
+            if (gfx_defaultWaitMenu("WARNING!\n\nThis should only be used if you know what signing and a save is\nDo not do this if you don't know what this does\n\nRequires you to have a prod.keys located in the switch folder\n", 5)){
+                gfx_clearscreen();
+                gfx_printf("Signing save...\n");
+                if (save_sign("sd:/switch/prod.keys", fsutil_getnextloc(currentpath, file.name))){
+                    gfx_printf("Done!\nPress any key to exit");
+                    hidWait();
+                }
+            }
+
             break;
         case -1:
             return -1;

source/tegraexplorer/fs/fsactions.c

@@ -15,7 +15,6 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
     FIL in, out;
     FILINFO in_info;
     u64 sizeRemaining, toCopy;
-    UINT temp1, temp2;
     u8 *buff, toPrint = options & COPY_MODE_PRINT, toCancel = options & COPY_MODE_CANCEL;
     u32 x, y, i = 11;
     int res;
@@ -32,12 +31,12 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
         return 1;
     }
 
-    if (f_stat(locin, &in_info)){
+    if ((res = f_stat(locin, &in_info))){
         gfx_errDisplay("copy", res, 3);
         return 1;
     }
        
-    if (f_open(&out, locout, FA_CREATE_ALWAYS | FA_WRITE)){
+    if ((res = f_open(&out, locout, FA_CREATE_ALWAYS | FA_WRITE))){
         gfx_errDisplay("copy", res, 4);
         return 1;
     }
@@ -56,19 +55,14 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
     while (sizeRemaining > 0){
         toCopy = MIN(sizeRemaining, BUFSIZE);
 
-        if ((res = f_read(&in, buff, toCopy, &temp1))){
+        if ((res = f_read(&in, buff, toCopy, NULL))){
             gfx_errDisplay("copy", res, 5);
-            return 1;
+            break;
         }
             
-        if ((res = f_write(&out, buff, toCopy, &temp2))){
+        if ((res = f_write(&out, buff, toCopy, NULL))){
             gfx_errDisplay("copy", res, 6);
-            return 1;
+            break;
-        }
-            
-        if (temp1 != temp2){
-            gfx_errDisplay("copy", ERR_DISK_WRITE_FAILED, 7);
-            return 1;
         }
 
         sizeRemaining -= toCopy;
@@ -91,19 +85,19 @@ int fsact_copy(const char *locin, const char *locout, u8 options){
         }
     }
 
+    if (toPrint){
         RESETCOLOR;
+        gfx_con_setpos(x - 16, y);
+    }
 
     f_close(&in);
     f_close(&out);
     free(buff);
 
-    if ((res = f_chmod(locout, in_info.fattrib, 0x3A))){
+    f_chmod(locout, in_info.fattrib, 0x3A);
-        gfx_errDisplay("copy", res, 8);
-        return 1;
-    }
 
     f_stat(locin, &in_info); //somehow stops fatfs from being weird
-    return 0;
+    return res;
 }
 
 int fsact_del_recursive(char *path){

source/tegraexplorer/fs/fsextractbis.c

@@ -13,25 +13,15 @@
 #include "../utils/utils.h"
 #include "fsactions.h"
 
-u32 DecodeInt(u8* data) {
-    u32 out = 0;
-
-    for (int i = 0; i < 4; i++) {
-        out |= (data[i] << ((3 - i) * 8));
-    }
-
-    return out;
-}
-
 void copy_fil_size(FIL* in_src, FIL* out_src, int size_src){
     u8* buff;
-    buff = calloc(16384, sizeof(u8));
+    buff = calloc(BUFSIZE, sizeof(u8));
 
     int size = size_src;
     int copysize;
 
     while (size > 0){
-        copysize = MIN(16834, size);
+        copysize = MIN(BUFSIZE, size);
         f_read(in_src, buff, copysize, NULL);
         f_write(out_src, buff, copysize, NULL);
         size -= copysize;
@@ -48,56 +38,50 @@ void gen_part(int size, FIL* in, char *path){
     f_close(&out);
 }
 
+const char *filenames[] = {
+    "BOOT0.bin",
+    "BOOT1.bin",
+    "BCPKG2-1-Normal-Main",
+    "BCPKG2-3-SafeMode-Main",
+    "BCPKG2-2-Normal-Sub",
+    "BCPKG2-4-SafeMode-Sub"
+};
+
 int extract_bis_file(char *path, char *outfolder){
     FIL in;
     int res;
-    u8 version[0x10];
-    u8 args;
-    u8 temp[0x4];
-    u32 filesizes[4];
     char *tempPath;
+    BisFile header;
 
     if ((res = f_open(&in, path, FA_READ | FA_OPEN_EXISTING))){
         gfx_errDisplay("extract_bis_file", res, 0);
         return -1;
     }
 
-    f_read(&in, version, 0x10, NULL);
+    f_read(&in, &header, sizeof(BisFile), NULL);
-    f_read(&in, &args, 1, NULL);
     
+    for (int i = 0; i < 4; i++)
+        header.sizes[i] = FLIPU32(header.sizes[i]);
+
+    gfx_printf("Version: %s\n\n", header.version);
+
+    // Loop to actually extract stuff
     for (int i = 0; i < 4; i++){
-        f_read(&in, temp, 4, NULL);
+        if (!(header.args & (BIT((7 - i)))))
-        filesizes[i] = DecodeInt(temp);
+            continue;
+
+        gfx_printf("Extracting %s\n", filenames[i]);
+        gen_part(header.sizes[i], &in, fsutil_getnextloc(outfolder, filenames[i]));
     }
 
-    gfx_printf("Version: %s\n\n", version);
+    // Loop to copy pkg2_1->2 and pkg2_3->4
+    for (int i = 4; i < 6; i++){
+        if (!(header.args & BIT((9 - i))))
+            continue;
 
-    if (args & BOOT0_ARG){
+        utils_copystring(fsutil_getnextloc(outfolder, filenames[i - 2]), &tempPath);
-        gfx_printf("\nExtracting BOOT0\n");
+        gfx_printf("Copying %s\n", filenames[i]);
-        gen_part(filesizes[0], &in, fsutil_getnextloc(outfolder, "BOOT0.bin"));
+        fsact_copy(tempPath, fsutil_getnextloc(outfolder, filenames[i]), COPY_MODE_PRINT);
-    }
-        
-    if (args & BOOT1_ARG){
-        gfx_printf("Extracting BOOT1\n");
-        gen_part(filesizes[1], &in, fsutil_getnextloc(outfolder, "BOOT1.bin"));
-    }
-
-    if (args & BCPKG2_1_ARG){
-        utils_copystring(fsutil_getnextloc(outfolder, "BCPKG2-1-Normal-Main"), &tempPath);
-        gfx_printf("Extracting BCPKG2_1/2\n");
-
-        gen_part(filesizes[2], &in, tempPath);
-        fsact_copy(tempPath, fsutil_getnextloc(outfolder, "BCPKG2-2-Normal-Sub"), COPY_MODE_PRINT);
-        RESETCOLOR;
-        free(tempPath);
-    }   
-    
-    if (args & BCPKG2_3_ARG){
-        utils_copystring(fsutil_getnextloc(outfolder, "BCPKG2-3-SafeMode-Main"), &tempPath);
-        gfx_printf("Extracting BCPKG2_3/4\n");
-
-        gen_part(filesizes[3], &in, tempPath);
-        fsact_copy(tempPath, fsutil_getnextloc(outfolder, "BCPKG2-4-SafeMode-Sub"), COPY_MODE_PRINT);
         RESETCOLOR;
         free(tempPath);
     }

source/tegraexplorer/fs/fsutils.h

@@ -2,6 +2,14 @@
 #include "../common/types.h"
 #include "../../utils/types.h"
 
+typedef struct {
+    u8 version[0x10];
+    u8 args;
+    u32 sizes[4];
+} __attribute__((__packed__)) BisFile;
+
+#define FLIPU32(in) ((in >> 24) & 0xFF) | ((in >> 8) & 0xFF00) | ((in << 8) & 0xFF0000) | ((in << 24) & 0xFF000000)
+
 char *fsutil_getnextloc(const char *current, const char *add);
 char *fsutil_getprevloc(char *current);
 bool fsutil_checkfile(char* path);

source/tegraexplorer/fs/keys.c

@@ -0,0 +1,62 @@
+#include "keys.h"
+#include "../../utils/types.h"
+#include "../../libs/fatfs/ff.h"
+#include "../../sec/se.h"
+#include "../../mem/heap.h"
+#include "../gfx/gfxutils.h"
+#include "../../config/ini.h"
+#include "../common/common.h"
+#include <string.h>
+
+char *getKey(const char *search, link_t *inilist){
+    LIST_FOREACH_ENTRY(ini_sec_t, ini_sec, inilist, link){
+        if (ini_sec->type == INI_CHOICE){
+            LIST_FOREACH_ENTRY(ini_kv_t, kv, &ini_sec->kvs, link)
+	    	{
+                if (!strcmp(search, kv->key))
+                    return kv->val;
+	    	}
+        }   
+    }
+    return NULL;
+}
+
+u8 getHexSingle(const char c) {
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+}
+
+u8 *getHex(const char *in){
+    u32 len = strlen(in), count = 0;
+    u8 *out = calloc(len / 2, sizeof(u8));
+
+    for (u32 i = 0; i < len; i += 2){
+        out[count++] = (u8)(getHexSingle(in[i]) << 4) | (getHexSingle(in[i + 1]));
+    }
+
+    return out;
+}
+
+u8 *GetKey(const char *keypath, const char *keyName){
+    LIST_INIT(inilist);
+    char *key;
+    u8 *hex = NULL;
+
+    if (!ini_parse(&inilist, keypath, false)){
+        gfx_errDisplay("GetKey", ERR_INI_PARSE_FAIL, 1);
+        goto out_free;
+    }
+
+    if ((key = getKey(keyName, &inilist)) == NULL){
+        gfx_errDisplay("GetKey", ERR_INI_PARSE_FAIL, 2);
+        goto out_free;
+    }
+
+    hex = getHex(key);
+
+out_free:;
+    list_empty(&inilist);
+    return hex;
+}

source/tegraexplorer/fs/keys.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "../../utils/types.h"
+
+u8 *GetKey(const char *keypath, const char *keyName);

source/tegraexplorer/fs/nca.c

@@ -0,0 +1,46 @@
+#include "nca.h"
+#include "keys.h"
+#include "../../utils/types.h"
+#include "../../libs/fatfs/ff.h"
+#include "../../sec/se.h"
+#include "../../mem/heap.h"
+#include "../gfx/gfxutils.h"
+#include "../../config/ini.h"
+#include "../common/common.h"
+#include <string.h>
+
+int SetHeaderKey(){
+    u8 *header_key = GetKey("sd:/switch/prod.keys", "header_key");
+
+    if (header_key == NULL)
+        return -1;
+
+    se_aes_key_set(4, header_key + 0x00, 0x10);
+    se_aes_key_set(5, header_key + 0x10, 0x10);
+
+    return 0;
+}
+
+int GetNcaType(char *ncaPath){
+    FIL fp;
+    u32 read_bytes = 0;
+
+    if (f_open(&fp, ncaPath, FA_READ | FA_OPEN_EXISTING))
+        return -1;
+
+    u8 *dec_header = (u8*)malloc(0x600);
+
+    if (f_lseek(&fp, 0x200) || f_read(&fp, dec_header, 32, &read_bytes) || read_bytes != 32){
+        f_close(&fp);
+        free(dec_header);
+        return -1;
+    }
+
+    se_aes_xts_crypt(5,4,0,1,dec_header + 0x200, dec_header, 32, 1);
+
+    u8 ContentType = dec_header[0x205];
+    
+    f_close(&fp);
+    free(dec_header);
+    return ContentType;
+}

source/tegraexplorer/fs/nca.h

@@ -0,0 +1,4 @@
+#pragma once
+
+int GetNcaType(char *ncaPath);
+int SetHeaderKey();

source/tegraexplorer/fs/savesign.c

@@ -0,0 +1,77 @@
+#include "savesign.h"
+#include "keys.h"
+#include "../../utils/types.h"
+#include "../../libs/fatfs/ff.h"
+#include "../../sec/se.h"
+#include "../../mem/heap.h"
+#include "../gfx/gfxutils.h"
+#include "../../config/ini.h"
+#include "../common/common.h"
+#include <string.h>
+
+bool save_commit(const char *path, u8 *save_mac_key){
+    FIL file;
+    int res;
+    u8 *buf, hash[0x20], *cmac_data, cmac[0x10];
+    const u32 hashed_data_size = 0x3D00, cmac_data_size = 0x200;
+    bool success = false;
+    
+    buf = malloc(hashed_data_size);
+    cmac_data = malloc(cmac_data_size);
+
+    if ((res = f_open(&file, path, FA_OPEN_EXISTING | FA_READ | FA_WRITE))){
+        gfx_errDisplay("save_commit", res, 1);
+        goto out_free;
+    }
+
+    f_lseek(&file, 0x300);
+    if ((res = f_read(&file, buf, hashed_data_size, NULL))){
+        gfx_errDisplay("save_commit", res, 2);
+        goto out_free;
+    }
+
+    se_calc_sha256(hash, buf, hashed_data_size);
+
+    f_lseek(&file, 0x108);
+    if ((res = f_write(&file, hash, sizeof(hash), NULL))){
+        gfx_errDisplay("save_commit", res, 3);
+        goto out_free;
+    }
+
+    f_lseek(&file, 0x100);
+    if ((res = f_read(&file, cmac_data, cmac_data_size, NULL))){
+        gfx_errDisplay("save_commit", res, 4);
+        goto out_free;
+    }
+
+    se_aes_key_set(3, save_mac_key, 0x10);
+    se_aes_cmac(3, cmac, 0x10, cmac_data, cmac_data_size);
+
+    f_lseek(&file, 0);
+
+    if ((res = f_write(&file, cmac, sizeof(cmac), NULL))){
+        gfx_errDisplay("save_commit", res, 5);
+        goto out_free;
+    }
+
+    success = true;
+
+out_free:;
+    free(buf);
+    free(cmac_data);
+    f_close(&file);
+    return success;
+}
+
+bool save_sign(const char *keypath, const char *savepath){
+    u8 *key = GetKey(keypath, "save_mac_key");
+
+    if (key == NULL){
+        return false;
+    }
+
+    if (!save_commit(savepath, key))
+        return false;
+
+    return true;
+}

source/tegraexplorer/fs/savesign.h

@@ -0,0 +1,4 @@
+#pragma once
+#include "../../utils/types.h"
+
+bool save_sign(const char *keypath, const char *savepath);

source/tegraexplorer/gfx/gfxutils.c

@@ -23,7 +23,7 @@ void gfx_clearscreen(){
     gfx_boxGrey(0, 703, 1279, 719, 0xFF);
     gfx_boxGrey(0, 0, 1279, 15, 0xFF);
     gfx_con_setpos(0, 0);
-    gfx_printf("Tegraexplorer v2.0.1 | Battery: %3d%%\n", battery >> 8);
+    gfx_printf("Tegraexplorer v2.0.4 | Battery: %3d%%\n", battery >> 8);
 
     RESETCOLOR;
 }
@@ -52,7 +52,7 @@ u32 gfx_errDisplay(const char *src_func, int err, int loc){
     
     if (err < 15)
         gfx_printf("Desc: %s\n", utils_err_codes[err]);
-    else if (err >= ERR_SAME_LOC && err <= ERR_NO_DESTINATION)
+    else if (err >= ERR_SAME_LOC && err <= ERR_IN_FUNC)
         gfx_printf("Desc: %s\n", utils_err_codes_te[err - 50]);
 
     if (loc)

source/tegraexplorer/gfx/menu.c

@@ -18,6 +18,9 @@ extern bool sd_inited;
 #pragma GCC optimize ("O2")
 
 void _printentry(menu_entry *entry, bool highlighted, bool refresh, const char *path){
+    if (entry->isHide)
+        return;
+
     u32 color = (entry->isMenu) ? entry->storage : ((entry->isDir) ? COLOR_WHITE : COLOR_VIOLET);
 
     SWAPALLCOLOR((highlighted) ? COLOR_DEFAULT : color, (highlighted) ? color : COLOR_DEFAULT);
@@ -62,7 +65,7 @@ void _printentry(menu_entry *entry, bool highlighted, bool refresh, const char *
 
 bool disableB = false;
 int menu_make(menu_entry *entries, int amount, const char *toptext){
-    int currentpos = 0, offset = 0, delay = 300, minscreen = 0, maxscreen = 39, calculatedamount = 0;
+    int currentpos = 0, offset = 0, delay = 300, minscreen = 0, calculatedamount = 0, cursub = 0, temp;
     u32 scrolltimer, timer, sideY;
     bool refresh = true;
     Inputs *input = hidRead();
@@ -95,56 +98,53 @@ int menu_make(menu_entry *entries, int amount, const char *toptext){
         gfx_sideprintf("\n\n\n");
     }
 
-    gfx_drawScrollBar(minscreen, maxscreen, amount);
+    for (;;){
-
-    while (!(input->a)){
         gfx_con_setpos(0, 48);
         timer = get_tmr_ms();
 
-        if (!currentpos){
+        if (!currentpos)
-            while (currentpos < amount && entries[currentpos].property & (ISSKIP | ISHIDE))
+            cursub = 1;
-                currentpos++;
+        else if (currentpos == amount - 1)
-        }
+            cursub = -1;
-        if (currentpos == amount - 1){
+        else
-            while (currentpos >= 1 && entries[currentpos].property & (ISSKIP | ISHIDE))
+            cursub = 0;
-                currentpos--;
-        }
             
-        if (currentpos > maxscreen){
+        while (entries[currentpos].property & (ISSKIP | ISHIDE))
-            offset += currentpos - maxscreen;
+                currentpos += cursub;
-            minscreen += currentpos - maxscreen;
+        
-            maxscreen += currentpos - maxscreen;
+
+        if (currentpos > (minscreen + SCREENMAXOFFSET)){
+            offset += currentpos - (minscreen + SCREENMAXOFFSET);
+            minscreen += currentpos - (minscreen + SCREENMAXOFFSET);
             refresh = true;
         }
-
+        else if (currentpos < minscreen){
-        if (currentpos < minscreen){
             offset -= minscreen - currentpos;
-            maxscreen -= minscreen - currentpos;
             minscreen -= minscreen - currentpos;  
             refresh = true;    
         }
             
+
         if (refresh || currentfolder == NULL || !calculatedamount){
-            for (int i = 0 + offset; i < amount && i < 40 + offset; i++)
+            for (int i = 0 + offset; i < amount && i < SCREENMAXOFFSET + 1 + offset; i++)
-                if (!(entries[i].isHide))
                 _printentry(&entries[i], (i == currentpos), refresh, toptext);
         }
         else {
-            if (currentpos - minscreen > 0){
+            temp = (currentpos - minscreen > 0) ? 0 : 16;
-                gfx_con_setpos(0, 32 + (currentpos - minscreen) * 16);
+            gfx_con_setpos(0, 32 + temp + (currentpos - minscreen) * 16);
+
+            if (!temp)
                 _printentry(&entries[currentpos - 1], false, false, toptext);
-            }
-            else
-                gfx_con_setpos(0, 48 + (currentpos - minscreen) * 16);
 
             _printentry(&entries[currentpos], true, false, toptext);
 
-            if (currentpos < amount - 1 && currentpos < maxscreen)
+            if (currentpos < MIN(amount - 1, minscreen + SCREENMAXOFFSET))
                 _printentry(&entries[currentpos + 1], false, false, toptext);
         }
 
         RESETCOLOR;
 
+
         sideY = gfx_sideGetY();
         if (!(entries[currentpos].isMenu)){
             gfx_sideprintf("Current selection:\n");
@@ -158,17 +158,19 @@ int menu_make(menu_entry *entries, int amount, const char *toptext){
             gfx_boxGrey(800, sideY, 1279, sideY + 48, 0x1B);
 
         gfx_con_setpos(0, 703);
-        SWAPCOLOR(COLOR_DEFAULT);
+        SWAPALLCOLOR(COLOR_DEFAULT, COLOR_WHITE);
-        SWAPBGCOLOR(COLOR_WHITE);
         gfx_printf("Time taken for screen draw: %dms  ", get_tmr_ms() - timer);
 
         if (refresh)
-            gfx_drawScrollBar(minscreen, maxscreen, amount);
+            gfx_drawScrollBar(minscreen, minscreen + SCREENMAXOFFSET, amount);
+
+        refresh = false;
+
 
         while (hidRead()->buttons & (KEY_B | KEY_A));
 
-        input->buttons = 0;
+        scrolltimer = get_tmr_ms();
-        while (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))){
+        while (1){
             if (sd_inited && !!gpio_read(GPIO_PORT_Z, GPIO_PIN_1)){
                 gfx_errDisplay("menu", ERR_SD_EJECTED, 0);
                 sd_unmount();
@@ -177,44 +179,53 @@ int menu_make(menu_entry *entries, int amount, const char *toptext){
 
             input = hidRead();
 
-            if (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN)))
+            if (!(input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))){
                 delay = 300;
+                continue;
+            }
+            
+            if (input->buttons & (KEY_RDOWN | KEY_RUP)){
+                delay = 1;
+                input->Lup = input->Rup;
+                input->Ldown = input->Rdown;
+            }
 
             if (delay < 300){
-                scrolltimer = get_tmr_ms();
+                if (scrolltimer + delay < get_tmr_ms()){
-                while (input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN)){
+                    break;
-                    if (scrolltimer + delay <= get_tmr_ms())
+                }
+            }
+            else {
                 break;
-
-                    input = hidRead();       
             }
         }
 
-            if (delay > 46 && input->buttons & (KEY_A | KEY_LDOWN | KEY_LUP | KEY_B | KEY_RUP | KEY_RDOWN))
-                delay -= 45;
 
-            if (input->buttons & (KEY_RUP | KEY_RDOWN))
+        if (input->a){
-                delay = 1;
+            break;
         }   
-
+        if (input->b && !disableB){
-        if (input->buttons & (KEY_LUP | KEY_RUP) && currentpos >= 1){
-            currentpos--;
-            while(entries[currentpos].property & (ISSKIP | ISHIDE) && currentpos >= 1)
-                currentpos--;
-        }
-            
-        else if (input->buttons & (KEY_LDOWN | KEY_RDOWN) && currentpos < amount - 1){
-            currentpos++;
-            while(entries[currentpos].property & (ISSKIP | ISHIDE) && currentpos < amount - 1)
-                currentpos++;
-        }
-
-        else if (input->b && !disableB){
             currentpos = 0;
             break;
         }
 
-        refresh = false;
+
+        if (delay > 46)
+            delay -= 45;
+
+
+        if (input->Lup && currentpos > 0)
+            cursub = -1;
+        else if (input->Ldown && currentpos < amount - 1)
+            cursub = 1;
+        else
+            cursub = 0;
+
+        if (cursub){
+            do {
+                currentpos += cursub;
+            } while (currentpos < amount - 1 && currentpos > 0 && entries[currentpos].property & (ISSKIP | ISHIDE));
+        }
     }
 
     minerva_periodic_training();

source/tegraexplorer/gfx/menu.h

@@ -1,4 +1,6 @@
 #pragma once
 #include "../common/types.h"
 
+#define SCREENMAXOFFSET 39
+
 int menu_make(menu_entry *entries, int amount, const char *toptext);

source/tegraexplorer/mainmenu.c

@@ -37,23 +37,11 @@ void MainMenu_SDCard(){
 
 void MainMenu_EMMC(){
     if (gfx_defaultWaitMenu("You're about to enter EMMC\nModifying anything here can result in a BRICK!\n\nPlease only continue if you know what you're doing", 4)){
-        /*
-        connect_mmc(SYSMMC);
-
-        if (!mount_mmc(emmc_fs_entries[res - 2], res - 1))
-            fileexplorer("emmc:/", 1);
-        */
        makeMmcMenu(SYSMMC);
     }
 }
 
 void MainMenu_EMUMMC(){
-    /*
-    connect_mmc(EMUMMC);
-
-    if (!mount_mmc(emmc_fs_entries[res - 5], res - 4))
-        fileexplorer("emmc:/", 1);
-    */
     makeMmcMenu(EMUMMC);
 }
 
@@ -62,8 +50,7 @@ void MainMenu_MountSD(){
 }
 
 void MainMenu_Tools(){
-    //res = makemenu(toolsmenu, 8);
+    res = menu_make(mainmenu_tools, 4, "-- Tools Menu --");
-    res = menu_make(mainmenu_tools, 5, "-- Tools Menu --");
 
     switch(res){
         case TOOLS_DISPLAY_INFO:
@@ -71,21 +58,17 @@ void MainMenu_Tools(){
             break;
         case TOOLS_DISPLAY_GPIO:
             displaygpio();
-            //makeMmcMenu(SYSMMC);
             break;
         case TOOLS_DUMPFIRMWARE:
-            dumpfirmware(SYSMMC);
+            res = menu_make(fwDump_typeMenu, 4, "-- Fw Type --");
-            break;
+            if (res >= 2)
-        case TOOLS_DUMPUSERSAVE:
+                dumpfirmware(SYSMMC, (res == 2));
-            if ((res = utils_mmcMenu()) > 0)
-                dumpusersaves(res);
 
             break;
     }
 }
 
 void MainMenu_SDFormat(){
-    //res = makemenu(formatmenu, 4);
     res = menu_make(mainmenu_format, 3, "-- Format Menu --");
 
     if (res > 0){

source/tegraexplorer/script/args.c

@@ -0,0 +1,281 @@
+#include "args.h"
+#include "parser.h"
+#include "scriptCtx.h"
+#include "lexer.h"
+#include "functions.h"
+#include "list.h"
+#include <string.h>
+#include "../../mem/heap.h"
+#include "../utils/utils.h"
+
+// do not include first openToken!
+int distanceBetweenTokens(lexarToken_t* tokens, u32 len, int openToken, int closeToken) {
+    int i = 0;
+    int layer = 0;
+    for (; i < len; i++) {
+        if (tokens[i].token == openToken)
+            layer++;
+        else if (tokens[i].token == closeToken) {
+            if (layer == 0)
+                return i;
+            layer--;
+        }
+    }
+
+    return -1;
+}
+
+dictValue_t getVarFromToken(scriptCtx_t* ctx, lexarToken_t* tokens, int* index, u32 maxLen) {
+    dictValue_t val = { 0 };
+    val.free = 0;
+    int i = *index;
+    u8 not = 0;
+    
+    if (tokens[i].token == Not) {
+        not = 1;
+        i++;
+    }
+
+    if (tokens[i].token == Not)
+        return ErrDictValue(ERRDOUBLENOT);
+
+    if (tokens[i].token == Variable) {
+        char* funcName = tokens[i].text;
+
+        if (tokens[i + 1].token == LBracket) {
+            i += 2;
+
+            int argCount = distanceBetweenTokens(&tokens[i], maxLen - 2, LBracket, RBracket);
+            if (argCount < 0)
+                return ErrDictValue(ERRSYNTAX);
+
+            ctx->args_loc.tokens = &tokens[i];
+            ctx->args_loc.stored = argCount;
+            val = executeFunction(ctx, funcName);
+            
+            i += argCount;
+        }
+        else if (tokens[i + 1].token == LSBracket) {
+            dictValue_t* var = varVectorFind(&ctx->vars, tokens[i].text);
+            i += 2;
+
+            if (var == NULL)
+                return ErrDictValue(ERRNOVAR);
+
+            int argCount = distanceBetweenTokens(&tokens[i], maxLen - 2, LSBracket, RSBracket);
+            if (argCount < 0)
+                return ErrDictValue(ERRSYNTAX);
+
+            dictValue_t index = solveEquation(ctx, &tokens[i], argCount);
+            i += argCount;
+
+            if (index.varType != IntType)
+                return ErrDictValue(ERRINVALIDTYPE);
+
+            if (var->arrayLen <= index.integer || index.integer < 0)
+                return ErrDictValue(ERRSYNTAX);
+
+            switch (var->varType) {
+                case StringArrayType:
+                    val = StrDictValue(var->stringArray[index.integer]);
+                    break;
+                case IntArrayType:
+                    val = IntDictValue(var->integerArray[index.integer]);
+                    break;
+                case ByteArrayType:
+                    val = IntDictValue(var->byteArray[index.integer]);
+                    break;
+                default:
+                    return ErrDictValue(ERRINVALIDTYPE);
+            } 
+        }
+        else {
+            dictValue_t* var = varVectorFind(&ctx->vars, tokens[i].text);
+
+            if (var != NULL) {
+                if (var->type == IntType) {
+                    val = IntDictValue(var->integer);
+                }
+                else if (var->type == StringType){
+                    val = StrDictValue(util_cpyStr(var->string));
+                    val.free = 1;
+                }
+                else {
+                    val = *var;
+                    val.free = 0;
+                }
+            }
+            else
+                return ErrDictValue(ERRNOVAR);
+        }
+    }
+    else if (tokens[i].token == LSBracket) {
+        i++;
+
+        int argCount = distanceBetweenTokens(&tokens[i], maxLen - 1, LSBracket, RSBracket);
+        if (argCount <= 0)
+            return ErrDictValue(-5);
+
+        varVector_t arrayVars = extractVars(ctx, &tokens[i], argCount);
+        int type = arrayVars.vars[0].value.varType;
+        if (!(type == StringType || type == IntType))
+            return ErrDictValue(ERRINVALIDTYPE);
+
+        val.type = (type + 2) | FREEINDICT;
+        val.arrayLen = arrayVars.stored;
+        val.integerArray = calloc(val.arrayLen, (type == IntType) ? sizeof(int) : sizeof(char*));
+        val.free = (type == StringType) ? 1 : 0;
+
+        for (int i = 0; i < arrayVars.stored; i++) {
+            if (arrayVars.vars[i].value.varType != type)
+                return ErrDictValue(ERRINVALIDTYPE); // Free-ing issue!!
+
+            if (type == StringType) {
+                val.stringArray[i] = util_cpyStr(arrayVars.vars[i].value.string);
+            }
+            else {
+                val.integerArray[i] = arrayVars.vars[i].value.integer;
+            }
+        }
+
+        i += argCount;
+        varVectorFree(&arrayVars);
+    }
+    else if (tokens[i].token == LBracket) {
+        i += 1;
+        int argCount = distanceBetweenTokens(&tokens[i], maxLen - 1, LBracket, RBracket);
+        if (argCount < 0)
+            return ErrDictValue(ERRSYNTAX);
+
+        val = solveEquation(ctx, &tokens[i], argCount);
+        i += argCount;
+    }
+    else if (tokens[i].token == IntLit) {
+        val = IntDictValue(tokens[i].val);
+    }
+    else if (tokens[i].token == StrLit) {
+        val = StrDictValue(tokens[i].text); // Do we need to copy the string here? if we set var.free = 0, it shouldn't matter
+        val.free = 0;
+    }
+    else {
+        // ERR
+        return ErrDictValue(ERRNOVAR);
+    }
+
+    if (not) {
+        if (val.type == IntType)
+            val.integer = !val.integer;
+        else
+            return ErrDictValue(ERRINVALIDTYPE);
+    }
+
+    *index = i;
+    return val;
+}
+
+int matchTypes(dictValue_t d1, dictValue_t d2, int type) {
+    return (d1.varType == d2.varType && d1.varType == type);
+}
+
+#define ELIFT(token) else if (localOpToken == token)
+
+dictValue_t solveEquation(scriptCtx_t *ctx, lexarToken_t* tokens, u32 len) {
+    dictValue_t res = { 0 };
+    u16 lastToken = 0;
+        
+    for (int i = 0; i < len; i++) {
+        if (tokens[i].token == Variable || tokens[i].token == StrLit || tokens[i].token == IntLit || tokens[i].token == Not || tokens[i].token == LBracket || tokens[i].token == LSBracket){
+            dictValue_t val = getVarFromToken(ctx, tokens, &i, len - i);
+
+            if (val.type == ErrType)
+                return val;
+
+            if (lastToken) {
+                u16 localOpToken = lastToken; // do we need local op token?
+                lastToken = 0;
+
+                if (matchTypes(res, val, IntType)) {
+                    if (localOpToken == Plus)
+                        res.integer += val.integer;
+                    ELIFT(Minus)
+                        res.integer -= val.integer;
+                    ELIFT(Multiply)
+                        res.integer *= val.integer;
+                    ELIFT(Division)
+                        res.integer /= val.integer;
+                    ELIFT(Mod)
+                        res.integer %= val.integer;
+                    ELIFT(Smaller)
+                        res.integer = res.integer < val.integer;
+                    ELIFT(SmallerEqual)
+                        res.integer = res.integer <= val.integer;
+                    ELIFT(Bigger)
+                        res.integer = res.integer > val.integer;
+                    ELIFT(BiggerEqual)
+                        res.integer = res.integer >= val.integer;
+                    ELIFT(EqualEqual)
+                        res.integer = res.integer == val.integer;
+                    ELIFT(NotEqual)
+                        res.integer = res.integer != val.integer;
+                    ELIFT(LogicAND) {
+                        res.integer = res.integer && val.integer;
+                        if (!res.integer)
+                            break;
+                    }
+                    ELIFT(LogicOR) {
+                        res.integer = res.integer || val.integer;
+                        if (res.integer)
+                            break;
+                    }
+                    ELIFT(AND)
+                        res.integer = res.integer & val.integer;
+                    ELIFT(OR)
+                        res.integer = res.integer | val.integer;
+                    else
+                        return ErrDictValue(ERRBADOPERATOR);
+                }
+                else if (matchTypes(res, val, StringType)) {
+                    if (localOpToken == Plus) {
+                        char* buff = calloc(strlen(res.string) + strlen(val.string) + 1, 1);
+                        strcpy(buff, res.string);
+                        strcat(buff, val.string);
+                        if (res.free)
+                            free(res.string);
+                        if (val.free)
+                            free(val.string);
+                        res.string = buff;
+                    }
+                    ELIFT(EqualEqual) {
+                        res.type = IntType;
+                        int compRes = !strcmp(res.string, val.string);
+                        if (res.free)
+                            free(res.string);
+                        if (val.free)
+                            free(val.string);
+                        res.integer = compRes;
+                        res.free = 0;
+                    }
+                    ELIFT(Minus) {
+                        if (!strcmp(res.string + strlen(res.string) - strlen(val.string), val.string)) {
+                            *(res.string + strlen(res.string) - strlen(val.string)) = 0;
+                        }
+
+                        free(val.string);
+                    }
+                    else 
+                        return ErrDictValue(ERRBADOPERATOR);
+                }
+                else
+                    return ErrDictValue(ERRBADOPERATOR);
+            }
+            else {
+                res = val;
+            }
+        }
+        else if (tokens[i].token >= Plus && tokens[i].token <= OR) {
+            lastToken = tokens[i].token;
+        }
+    }
+
+    return res;
+}

source/tegraexplorer/script/args.h

@@ -0,0 +1,6 @@
+#pragma once
+#include "types.h"
+
+char* createStrOutTextHolder(textHolder_t t);
+dictValue_t solveEquation(scriptCtx_t* ctx, lexarToken_t* tokens, u32 len);
+int distanceBetweenTokens(lexarToken_t* tokens, u32 len, int openToken, int closeToken);

source/tegraexplorer/script/functions.c

@@ -1,603 +1,177 @@
-#include <string.h>
-#include <stdlib.h>
-#include "../../mem/heap.h"
-#include "../gfx/gfxutils.h"
-#include "../emmc/emmc.h"
-#include "../../utils/types.h"
-#include "../../libs/fatfs/ff.h"
-#include "../../utils/sprintf.h"
-#include "../../hid/hid.h"
-#include "../../gfx/gfx.h"
-#include "../../utils/util.h"
-#include "../../storage/emummc.h"
-#include "parser.h"
-#include "../common/common.h"
-#include "../fs/fsactions.h"
-#include "variables.h"
-#include "../utils/utils.h"
 #include "functions.h"
-#include "../fs/fsutils.h"
+#include "list.h"
-#include "../../utils/sprintf.h"
+#include "args.h"
-#include "../fs/fsactions.h"
+#include "parser.h"
-#include "../emmc/emmcoperations.h"
+#include "lexer.h"
-#include "../emmc/emmcmenu.h"
+#include "types.h"
+#include "scriptCtx.h"
+#include "../../gfx/gfx.h"
+#include "../../mem/heap.h"
+#include <string.h>
+#include "../../hid/hid.h"
 
-extern FIL scriptin;
+dictValue_t funcPrint(scriptCtx_t* ctx, varVector_t* args) {
-extern char **argv;
+	for (int i = 0; i < args->stored; i++) {
-extern u32 argc;
+		switch (args->vars[i].value.varType) {
-extern int forceExit;
+		case IntType:
-extern short currentlyMounted;
+			gfx_printf("%d", args->vars[i].value.integer);
-
+			break;
-int parseIntInput(char *in, int *out){
+		case StringType:
-    if (in[0] == '@'){
+			gfx_printf("%s", args->vars[i].value.string);
-        if (str_int_find(in, out))
+			break;
-            return -1;
-    }
-    else
-        *out = atoi(in);
-    
-    return 0;
-}
-/*
-int parseJmpInput(char *in, u64 *out){
-    if (in[0] == '?'){
-        if (str_jmp_find(in, out))
-            return -1;
-        else
-            return 0;
-    }
-    else
-        return -1;
-}
-*/
-
-int parseStringInput(char *in, char **out){
-    if (in[0] == '$'){
-        if (str_str_find(in, out))
-            return -1;
-        else
-            return 0;
-    }
-    else{
-        *out = in; 
-        return 0;
 		}
 	}
 
-#pragma GCC push_options
+	return NullDictValue();
-#pragma GCC optimize ("Os")
-
-u32 currentcolor = COLOR_WHITE;
-int part_printf(){
-    SWAPCOLOR(currentcolor);
-    for (int i = 0; i < argc; i++){
-        if (argv[i][0] == '@'){
-            int toprintint;
-            if (parseIntInput(argv[i], &toprintint))
-                return -1;
-
-            gfx_printf("%d", toprintint);
-        }
-        else {
-            char *toprintstring;
-            if (parseStringInput(argv[i], &toprintstring))
-                return -1;
-
-            gfx_printf(toprintstring);
-        }
 }
 
+dictValue_t funcPrintln(scriptCtx_t* ctx, varVector_t* args) {
+	funcPrint(ctx, args);
 	gfx_printf("\n");
-    return 0;
+	return NullDictValue();
 }
 
-int part_print_int(){
+dictValue_t funcIf(scriptCtx_t* ctx, varVector_t* args) {
-    int toprint;
+	if (args->vars[0].value.varType == IntType) {
-    if (parseIntInput(argv[0], &toprint))
+		setCurIndentInstruction(ctx, (args->vars[0].value.integer == 0), -1);
-        return -1;
+		return NullDictValue();
-    
-    SWAPCOLOR(currentcolor);
-    gfx_printf("%s: %d\n", argv[0], toprint);
-    return 0;
 	}
 
-int part_Wait(){
+	return ErrDictValue(ERRINVALIDTYPE);
-    int arg;
-    u32 begintime;
-    SWAPCOLOR(currentcolor);
-
-    if (parseIntInput(argv[0], &arg))
-        return -1;
-
-    begintime = get_tmr_s();
-
-    while (begintime + arg > get_tmr_s()){
-        gfx_printf("\r<Wait %d seconds> ", (begintime + arg) - get_tmr_s());
 }
 
-    gfx_printf("\r                 \r");
+dictValue_t scriptElse(scriptCtx_t* ctx, varVector_t* args) {
-    return 0;
+	indentInstructor_t curInstruction = getCurIndentInstruction(ctx);
+	setCurIndentInstruction(ctx, !curInstruction.skip, -1);
+	return NullDictValue();
 }
 
-int part_Check(){
+dictValue_t scriptWhile(scriptCtx_t* ctx, varVector_t* args) {
-    int left, right;
+	if (args->vars[0].value.varType == IntType) {
-    if (parseIntInput(argv[0], &left))
+		setCurIndentInstruction(ctx, (args->vars[0].value.integer == 0), ctx->lastTokenPos);
-        return -1;
+		return NullDictValue();
-    if (parseIntInput(argv[2], &right))
-        return -1;
-
-    if (!strcmp(argv[1], "=="))
-        return (left == right);
-    else if (!strcmp(argv[1], "!="))
-        return (left != right);
-    else if (!strcmp(argv[1], ">="))
-        return (left >= right);
-    else if (!strcmp(argv[1], "<="))
-        return (left <= right);
-    else if (!strcmp(argv[1], ">"))
-        return (left > right);
-    else if (!strcmp(argv[1], "<"))
-        return (left < right);
-    else
-        return -1;
 	}
 
-int part_if(){
+	return ErrDictValue(ERRINVALIDTYPE);
-    int condition;
-    if (parseIntInput(argv[0], &condition))
-        return -1;
-
-    getfollowingchar('{');
-
-    if (!condition)
-        skipbrackets();
-    
-    return 0;
-
-    /*
-    if (condition)
-        return 0;
-    else {
-        skipbrackets();
-        return 0;
-    }
-    */
 }
 
-int part_if_args(){
+dictValue_t scriptLen(scriptCtx_t* ctx, varVector_t* args) {
-    int condition;
+	if (args->vars[0].value.varType >= IntArrayType && args->vars[0].value.varType <= ByteArrayType)
-    if ((condition = part_Check()) < 0)
+		return IntDictValue(args->vars[0].value.arrayLen);
-        return -1;
+	else if (args->vars[0].value.varType == StringType) {
-
+		if (args->vars[0].value.string != NULL)
-    getfollowingchar('{');
+			return IntDictValue(strlen(args->vars[0].value.string));
-
-    if (!condition)
-        skipbrackets();
-    
-    return 0;
 	}
 
-int part_Math(){
+	return ErrDictValue(ERRINVALIDTYPE);
-    int left, right;
-    if (parseIntInput(argv[0], &left))
-        return -1;
-    if (parseIntInput(argv[2], &right))
-        return -1;
-    
-    switch (argv[1][0]){
-        case '+':
-            return left + right;
-        case '-':
-            return left - right;
-        case '*':
-            return left * right;
-        case '/':
-            return left / right;
-    }
-    return -1;
 }
 
-int part_SetInt(){
+dictValue_t scriptMakeByteArray(scriptCtx_t* ctx, varVector_t* args) {
-    int out;
+	if (args->vars[0].value.varType == IntArrayType) {
-    parseIntInput(argv[0], &out);
+		u8* buff = calloc(args->vars[0].value.arrayLen, 1);
-    return out;
+		for (int i = 0; i < args->vars[0].value.arrayLen; i++) {
+			buff[i] = (u8)(args->vars[0].value.integerArray[i] & 0xFF);
 		}
 
-int part_SetString(){
+		return DictValueCreate(ByteArrayType | FREEINDICT, args->vars[0].value.arrayLen, buff);
-    char *arg0;
-    if (parseStringInput(argv[0], &arg0))
-        return -1;
-    if (argv[1][0] != '$')
-        return -1;
-
-    str_str_add(argv[1], arg0);
-    return 0;
 	}
 
-int part_SetStringIndex(){
+	return ErrDictValue(ERRINVALIDTYPE);
-    int index;
-    char *out;
-    if (parseIntInput(argv[0], &index))
-        return -1;
-    if (argv[1][0] != '$')
-        return -1;
-    if (str_str_index(index, &out))
-        return -1;
-
-    str_str_add(argv[1], out);
-    return 0;
 }
 
-int part_goto(){
+dictValue_t scriptWait(scriptCtx_t*ctx, varVector_t* args){
-    int target = 0;
+	Inputs* input = hidWait();
-    if (parseIntInput(argv[0], &target))
+	
-        return -1;
+	return IntDictValue(input->buttons);
-    f_lseek(&scriptin, target);
-    return 0;
 }
 
-int part_invert(){
+dictValue_t scriptSetPixel(scriptCtx_t *ctx, varVector_t* args){
-    int arg;
+	int pixelArgs[5] = {0};
-    if (parseIntInput(argv[0], &arg))
+
-        return -1;
+	for (int i = 0; i < args->stored; i++){
-    return (arg) ? 0 : 1;
+		if (args->vars[i].value.varType != IntType)
+			return ErrDictValue(ERRINVALIDTYPE);
+		pixelArgs[i] = args->vars[i].value.integer;
 	}
 
-int part_fs_exists(){
+	u32 color = 0xFF000000 | ((pixelArgs[2] & 0xFF) << 16) | ((pixelArgs[3] & 0xFF) << 8) | ((pixelArgs[4] & 0xFF));
-    char *path;
-    if (parseStringInput(argv[0], &path))
-        return -1;
 
-    return fsutil_checkfile(path);
+	gfx_setPixel(pixelArgs[0], pixelArgs[1], color);
+	return NullDictValue();
 }
 
-int part_ConnectMMC(){
+const static str_fnc_struct functions[] = {
-    char *arg;
+	{"print", funcPrint, {0x40}},
-    parseStringInput(argv[0], &arg);
+	{"println", funcPrintln, {0x40}},
-
+	{"if", funcIf, {1}},
-    if (!strcmp(arg, "SYSMMC"))
+	{"while", scriptWhile, {1}},
-        connect_mmc(SYSMMC);
+	{"else", scriptElse, {0}},
-    else if (!strcmp(arg, "EMUMMC"))
+	{"len", scriptLen, {1}},
-        connect_mmc(EMUMMC);
+	{"byte", scriptMakeByteArray, {1}},
-    else
+	{"wait", scriptWait, {0}},
-        return -1;
+	{"setPixel", scriptSetPixel, {5}},
-
+	{NULL, NULL, {0}},
-    return 0;
-}
-
-int part_MountMMC(){
-    char *arg;
-    parseStringInput(argv[0], &arg);
-    return mount_mmc(arg, 2);
-}
-
-int part_Pause(){
-    Inputs *input = hidWaitMask(KEY_A | KEY_B | KEY_X | KEY_Y | KEY_POW | KEY_VOLP | KEY_VOLM | KEY_LUP | KEY_LDOWN | KEY_LLEFT | KEY_LRIGHT);
-
-    str_int_add("@BTN_POWER", input->pow);
-    str_int_add("@BTN_VOL+", input->volp);
-    str_int_add("@BTN_VOL-", input->volm);
-    str_int_add("@BTN_A", input->a);
-    str_int_add("@BTN_B", input->b);
-    str_int_add("@BTN_X", input->x);
-    str_int_add("@BTN_Y", input->y);
-    str_int_add("@BTN_UP", input->Lup);
-    str_int_add("@BTN_DOWN", input->Ldown);
-    str_int_add("@BTN_LEFT", input->Lleft);
-    str_int_add("@BTN_RIGHT", input->Lright);
-    
-    return input->buttons;
-}
-
-int part_addstrings(){
-    char *combined, *left, *middle;
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &middle))
-        return -1;
-    if (argv[2][0] != '$')
-        return -1;
-    
-    combined = calloc(strlen(left) + strlen(middle) + 1, sizeof(char));
-    sprintf(combined, "%s%s", left, middle);
-    
-    str_str_add(argv[2], combined);
-    free(combined);
-    return 0;
-}
-
-int part_setColor(){
-    char *arg;
-    if (parseStringInput(argv[0], &arg))
-        return -1;
-
-    if (!strcmp(arg, "RED"))
-        currentcolor = COLOR_RED;
-    else if (!strcmp(arg, "ORANGE"))
-        currentcolor = COLOR_ORANGE;
-    else if (!strcmp(arg, "YELLOW"))
-        currentcolor = COLOR_YELLOW;
-    else if (!strcmp(arg, "GREEN"))
-        currentcolor = COLOR_GREEN;
-    else if (!strcmp(arg, "BLUE"))
-        currentcolor = COLOR_BLUE;
-    else if (!strcmp(arg, "VIOLET"))
-        currentcolor = COLOR_VIOLET;
-    else if (!strcmp(arg, "WHITE"))
-        currentcolor = COLOR_WHITE;
-    else
-        return -1;
-
-    return 0;
-}
-
-int part_Exit(){
-    forceExit = true;
-    return 0;
-}
-
-int part_fs_Move(){
-    char *left, *right;
-
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &right))
-        return -1;
-
-    int res;
-    res = f_rename(left, right);
-    if (res)
-        res = f_rename(left, right);
-    
-    return res;
-}
-
-int part_fs_Delete(){
-    char *arg;
-
-    if (parseStringInput(argv[0], &arg))
-        return -1;
-
-    int res;
-    res = f_unlink(arg);
-    if (res)
-        res = f_unlink(arg);
-    
-    return res;
-}
-
-int part_fs_DeleteRecursive(){
-    char *arg;
-
-    if (parseStringInput(argv[0], &arg))
-        return -1;
-
-    return fsact_del_recursive(arg);
-}
-
-int part_fs_Copy(){
-    char *left, *right;
-
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &right))
-        return -1;
-
-    return fsact_copy(left, right, COPY_MODE_PRINT);
-}
-
-int part_fs_CopyRecursive(){
-    char *left, *right;
-
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &right))
-        return -1;
-
-    return fsact_copy_recursive(left, right);
-}
-
-int part_fs_MakeDir(){
-    char *arg;
-
-    if (parseStringInput(argv[0], &arg))
-        return -1;
-
-    int res;
-    res = f_mkdir(arg);
-    if (res)
-        res = f_mkdir(arg);
-    
-    return res;
-}
-
-DIR dir;
-FILINFO fno;
-int isdirvalid = false;
-int part_fs_OpenDir(){
-    char *path;
-
-    if (parseStringInput(argv[0], &path))
-        return -1;
-
-    if (f_opendir(&dir, path))
-        return -1;
-    
-    isdirvalid = true;
-    str_int_add("@ISDIRVALID", isdirvalid);
-    return 0;
-}
-
-int part_fs_CloseDir(){
-    if (!isdirvalid)
-        return 0;
-
-    f_closedir(&dir);
-    isdirvalid = false;
-    str_int_add("@ISDIRVALID", isdirvalid);
-    return 0;
-}
-
-int part_fs_ReadDir(){
-    if (!isdirvalid)
-        return -1;
-
-    if (!f_readdir(&dir, &fno) && fno.fname[0]){
-        str_str_add("$FILENAME", fno.fname);
-        str_int_add("@ISDIR", (fno.fattrib & AM_DIR) ? 1 : 0);
-    }
-    else {
-        part_fs_CloseDir();
-    }
-
-    return 0;
-}
-
-int part_setPrintPos(){
-    int left, right;
-
-    if (parseIntInput(argv[0], &left))
-        return -1;
-
-    if (parseIntInput(argv[1], &right))
-        return -1;
-
-    if (left > 78)
-        return -1;
-
-    if (right > 42)
-        return -1;
-
-    gfx_con_setpos(left * 16, right * 16);
-    return 0;
-}
-
-int part_stringcompare(){
-    char *left, *right;
-
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &right))
-        return -1;
-
-    return (strcmp(left, right)) ? 0 : 1;
-}
-
-int part_fs_combinePath(){
-    char *combined, *left, *middle;
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &middle))
-        return -1;
-    if (argv[2][0] != '$')
-        return -1;
-    
-    combined = fsutil_getnextloc(left, middle);
-    
-    str_str_add(argv[2], combined);
-    free(combined);
-    return 0;
-}
-
-int part_mmc_dumpPart(){
-    char *left, *right;
-
-    if (parseStringInput(argv[0], &left))
-        return -1;
-    if (parseStringInput(argv[1], &right))
-        return -1;
-
-    if (!strcmp(left, "BOOT")){
-        return emmcDumpBoot(right);
-    }
-    else {
-        return emmcDumpSpecific(left, right);
-    }
-}
-
-int part_mmc_restorePart(){
-    char *path;
-
-    if (parseStringInput(argv[0], &path))
-        return -1;
-
-    if (currentlyMounted < 0)
-        return -1;
-
-    return mmcFlashFile(path, currentlyMounted);   
-}
-
-int part_fs_extractBisFile(){
-    char *path, *outfolder;
-
-    if (parseStringInput(argv[0], &path))
-        return -1;
-    if (parseStringInput(argv[1], &outfolder))
-        return -1;
-
-    return extract_bis_file(path, outfolder);
-}
-
-int part_clearscreen(){
-    gfx_clearscreen();
-    return 0;
-}
-
-int part_getPos(){
-    return (int)f_tell(&scriptin);
-}
-
-str_fnc_struct functions[] = {
-    {"printf", part_printf, 255},
-    {"printInt", part_print_int, 1},
-    {"setPrintPos", part_setPrintPos, 2},
-    {"clearscreen", part_clearscreen, 0},
-    {"if", part_if, 1},
-    {"if", part_if_args, 3}, // function overloading
-    {"math", part_Math, 3},
-    {"check", part_Check, 3},
-    {"setInt", part_SetInt, 1},
-    {"goto", part_goto, 1},
-    {"setString", part_SetString, 2},
-    {"setStringIndex", part_SetStringIndex, 2},
-    {"setColor", part_setColor, 1},
-    {"combineStrings", part_addstrings, 3},
-    {"compareStrings", part_stringcompare, 2},
-    {"invert", part_invert, 1},
-    {"fs_exists", part_fs_exists, 1},
-    {"fs_move", part_fs_Move, 2},
-    {"fs_mkdir", part_fs_MakeDir, 1},
-    {"fs_del", part_fs_Delete, 1},
-    {"fs_delRecursive", part_fs_DeleteRecursive, 1},
-    {"fs_copy", part_fs_Copy, 2},
-    {"fs_copyRecursive", part_fs_CopyRecursive, 2},
-    {"fs_openDir", part_fs_OpenDir, 1},
-    {"fs_closeDir", part_fs_CloseDir, 0},
-    {"fs_readDir", part_fs_ReadDir, 0},
-    {"fs_combinePath", part_fs_combinePath, 3},
-    {"fs_extractBisFile", part_fs_extractBisFile, 2},
-    {"mmc_connect", part_ConnectMMC, 1},
-    {"mmc_mount", part_MountMMC, 1},
-    {"mmc_dumpPart", part_mmc_dumpPart, 2},
-    {"mmc_restorePart", part_mmc_restorePart, 1},
-    {"getPosition", part_getPos, 0},
-    {"pause", part_Pause, 0},
-    {"wait", part_Wait, 1},
-    {"exit", part_Exit, 0},
-    {NULL, NULL, 0}
 };
 
-#pragma GCC pop_options
+varVector_t extractVars(scriptCtx_t* ctx, lexarToken_t* tokens, u32 len) {
+	varVector_t args = varVectorInit(4);
+	int lastLoc = 0;
+	for (int i = 0; i < len; i++) {
+		if (tokens[i].token == LSBracket) {
+			int distance = distanceBetweenTokens(&tokens[i + 1], len - i - 1, LSBracket, RSBracket);
+			i += distance + 1;
+		}
+		if (tokens[i].token == Seperator) {
+			dictValue_t res = solveEquation(ctx, &tokens[lastLoc], i - lastLoc);
+			lastLoc = i + 1;
+			varVectorAdd(&args, DictCreate(NULL, res));
+		}
+
+		if (i + 1 >= len) {
+			dictValue_t res = solveEquation(ctx, &tokens[lastLoc], i + 1 - lastLoc);
+			varVectorAdd(&args, DictCreate(NULL, res));
+		}
+	}
+
+	return args;
+}
+
+dictValue_t executeFunction(scriptCtx_t* ctx, char* func_name) {
+	int argCount = 0;
+	varVector_t args = { 0 };
+
+	if (ctx->args_loc.stored > 0) {
+		args = extractVars(ctx, ctx->args_loc.tokens, ctx->args_loc.stored);
+
+		for (int i = 0; i < args.stored; i++) {
+			if (args.vars[i].value.varType == ErrType)
+				return args.vars[i].value;
+		}
+
+		argCount = args.stored;
+	}
 
-int run_function(char *func_name, int *out){
 	for (u32 i = 0; functions[i].key != NULL; i++) {
 		if (!strcmp(functions[i].key, func_name)) {
-            if (argc != functions[i].arg_count && functions[i].arg_count != 255)
+			if (argCount != functions[i].argCount && !functions[i].varArgs)
 				continue;
 
-            *out = functions[i].value();
+			dictValue_t val = functions[i].value(ctx, &args);
-            return (*out < 0) ? -1 : 0;
+			// free args
+			varVectorFree(&args);
+			return val;
 		}
 	}
-    return -1;
+
+	dictValue_t* var = varVectorFind(&ctx->vars, func_name);
+	if (var != NULL) {
+		if (var->type == JumpType) {
+			setCurIndentInstruction(ctx, 0, ctx->curPos);
+			ctx->curPos = var->integer - 1;
+			ctx->lastToken.token = Invalid;
+			return NullDictValue();
+		}
+	}
+
+	return ErrDictValue(ERRNOFUNC);
 }

source/tegraexplorer/script/functions.h

@@ -1,13 +1,10 @@
 #pragma once
-#include "../../utils/types.h"
+#include "types.h"
 
-typedef void (*func_void_ptr)();
+#define BIT(n) (1U << n)
-typedef int (*func_int_ptr)();
 
-typedef struct {
+#define VARARGS(x) {x, 1, 0}
-    char *key;
+#define OPERATORARGS(x) {x, 0, 1}
-    func_int_ptr value;
-    u8 arg_count;
-} str_fnc_struct;
 
-int run_function(char *func_name, int *out);
+dictValue_t executeFunction(scriptCtx_t* ctx, char* func_name);
+varVector_t extractVars(scriptCtx_t* ctx, lexarToken_t* tokens, u32 len);

source/tegraexplorer/script/lexer.c

@@ -0,0 +1,195 @@
+#include "lexer.h"
+#include "parser.h"
+#include "args.h"
+#include "../utils/utils.h"
+#include "../../mem/heap.h"
+#include <string.h>
+
+static inline int isValidWord(char c) {
+	char r = c | 0x20;
+	return (r >= 'a' && r <= 'z');
+}
+
+static inline int isValidVar(char c) {
+	char r = c | 0x20;
+	return ((r >= 'a' && r <= 'z') || (r >= '0' && r <= '9'));
+}
+
+static inline int isValidNum(char c) {
+	return (c >= '0' && c <= '9');
+}
+
+static inline int isValidHexNum(char c) {
+	char r = c | 0x20;
+	return (isValidNum(r) || (r >= 'a' && r <= 'f'));
+}
+
+#define makeLexarToken(token, var) (lexarToken_t) {token, {var}}
+#define makeLexarIntToken(intVar) (lexarToken_t) {IntLit, .val = intVar}
+
+typedef struct {
+	u8 tokenC;
+	u16 tokenN;
+} lexarTranslation_t;
+
+lexarTranslation_t lexarTranslations[] = {
+	{'(', LBracket},
+	{')', RBracket},
+	{'{', LCBracket},
+	{'}', RCBracket},
+	{',', Seperator},
+	{'+', Plus},
+	{'-', Minus},
+	{'*', Multiply},
+	{'/', Division},
+	{'%', Mod},
+	{'<', Smaller},
+	{'>', Bigger},
+	{'=', Equal},
+	{'!', Not},
+	{'[', LSBracket},
+	{']', RSBracket},
+	{'\0', 0},
+};
+
+char lexarDebugGetTokenC(u16 tokenN) {
+	for (int i = 0; lexarTranslations[i].tokenC; i++) {
+		if (lexarTranslations[i].tokenN == tokenN) {
+			return lexarTranslations[i].tokenC;
+		}
+	}
+
+	return '?';
+}
+
+lexarVector_t lexarVectorInit(int startSize) {
+	lexarVector_t l = { 0 };
+	l.tokens = calloc(startSize, sizeof(lexarVector_t));
+	l.len = startSize;
+	l.stored = 0;
+	return l;
+}
+
+void lexarVectorAdd(lexarVector_t* vec, lexarToken_t token) {
+	if (vec->stored >= vec->len) {
+		vec->len *= 2;
+		//vec->tokens = realloc(vec->tokens, vec->len * sizeof(lexarToken_t));
+		void *temp = calloc(vec->len, sizeof(lexarToken_t));
+		memcpy(temp, vec->tokens, vec->len / 2 * sizeof(lexarToken_t));
+		free(vec->tokens);
+		vec->tokens = temp;
+	}
+
+	vec->tokens[vec->stored++] = token;
+}
+
+void lexarVectorClear(lexarVector_t* vec) {
+	for (int i = 0; i < vec->stored; i++) {
+		if (vec->tokens[i].token == Variable || vec->tokens[i].token == StrLit)
+			if (vec->tokens[i].text != NULL)
+				free(vec->tokens[i].text);
+	}
+	free(vec->tokens);
+}
+
+#define ELIFC(c) else if (*in == c)
+
+lexarVector_t lexarGo(const char* in) {
+	lexarVector_t vec = lexarVectorInit(16);
+
+	while (*in) {
+		if (isValidWord(*in)) {
+			char* startWord = in;
+			in++;
+			while (isValidVar(*in))
+				in++;
+
+			lexarVectorAdd(&vec, makeLexarToken(Variable, utils_copyStringSize(startWord, in - startWord)));
+			continue;
+		}
+		else if (isValidNum(*in) || (*in == '-' && isValidNum(in[1]))) {
+			int parse = 0;
+			u8 negative = (*in == '-');
+			if (negative)
+				in++;
+
+			if (*in == '0' && (in[1] | 0x20) == 'x') {
+				in += 2;
+				while (isValidHexNum(*in)) {
+					parse = parse * 16 + (*in & 0x0F) + (*in >= 'A' ? 9 : 0);
+					in++;
+				}
+			}
+			else while (isValidNum(*in)) {
+				parse = parse * 10 + *in++ - '0';
+			}
+
+			if (negative)
+				parse *= -1;
+
+			lexarVectorAdd(&vec, makeLexarIntToken(parse));
+			continue;
+		}
+		ELIFC('"') {
+			char* startStr = ++in;
+			while (*in != '"')
+				in++;
+
+			lexarVectorAdd(&vec, makeLexarToken(StrLit, utils_copyStringSize(startStr, in - startStr)));
+			in++;
+			continue;
+		}
+		ELIFC('#') {
+			while (*in != '\n')
+				in++;
+			
+			in++;
+			continue;
+		}
+		ELIFC('&') {
+			if (in[1] == '&') {
+				lexarVectorAdd(&vec, makeLexarToken(LogicAND, 0));
+				in++;
+			}
+			else {
+				lexarVectorAdd(&vec, makeLexarToken(AND, 0));
+			}
+
+			in++;
+			continue;
+		}
+		ELIFC('|') {
+			if (in[1] == '|') {
+				lexarVectorAdd(&vec, makeLexarToken(LogicOR, 0));
+				in++;
+			}
+			else {
+				lexarVectorAdd(&vec, makeLexarToken(OR, 0));
+			}
+
+			in++;
+			continue;
+		}
+
+		int val = 0;
+
+		for (int i = 0; lexarTranslations[i].tokenC; i++) {
+			if (lexarTranslations[i].tokenC == *in) {
+				val = lexarTranslations[i].tokenN;
+				break;
+			}
+		}
+
+		in++;
+
+		if (*in == '=' && val >= Smaller && val <= Not) {
+			val++;
+			in++;
+		}
+
+		if (val != Invalid)
+			lexarVectorAdd(&vec, makeLexarToken(val, 0));
+	}
+
+	return vec;
+}

source/tegraexplorer/script/lexer.h

@@ -0,0 +1,6 @@
+#pragma once
+#include "types.h"
+
+lexarVector_t lexarGo(const char* in);
+char lexarDebugGetTokenC(u16 tokenN);
+void lexarVectorClear(lexarVector_t* vec);

source/tegraexplorer/script/list.c

@@ -0,0 +1,88 @@
+#include "list.h"
+#include <string.h> 
+#include "types.h"
+#include "../../mem/heap.h"
+
+void freeDictValue(dictValue_t dv) {
+	if (dv.string == NULL)
+		return;
+
+	switch (dv.varType) {
+		case StringType:
+		case IntArrayType:
+		case ByteArrayType: // As it's a union with the biggest object being a pointer, this should be the same
+			free(dv.string);
+			break;
+		case StringArrayType:
+			for (unsigned int i = 0; i < dv.arrayLen; i++)
+				free(dv.stringArray[i]);
+
+			free(dv.stringArray);
+	}
+}
+
+void freeDict(dict_t* dict) {
+	freeDictValue(dict->value);
+	free(dict->key);
+	free(dict);
+}
+
+varVector_t varVectorInit(int startSize) {
+	varVector_t vec = { 0 };
+
+	vec.vars = calloc(startSize, sizeof(dict_t));
+	vec.len = startSize;
+	vec.stored = 0;
+	return vec;
+}
+
+dictValue_t* varVectorFind(varVector_t* vec, const char* key) {
+	for (int i = 0; i < vec->stored; i++) {
+		if (!strcmp(vec->vars[i].key, key))
+			return &vec->vars[i].value;
+	}
+
+	return NULL;
+}
+
+void varVectorAdd(varVector_t* vec, dict_t add) {
+	dictValue_t* var = NULL;
+	if (add.key != NULL)
+		var = varVectorFind(vec, add.key);
+
+	if (var != NULL) {
+		freeDictValue(*var);
+		*var = add.value;
+		free(add.key);
+		return;
+	}
+
+	if (vec->stored >= vec->len) {
+		vec->len *= 2;
+		dict_t* old = vec->vars;
+		//vec->vars = realloc(old, vec->len * sizeof(dict_t));
+		void *temp = calloc(vec->len, sizeof(dict_t));
+		memcpy(temp, vec->vars, vec->len / 2 * sizeof(dict_t));
+		free(vec->vars);
+		vec->vars = temp;
+		if (vec->vars == NULL) {
+			free(old);
+		}		
+	}
+
+	vec->vars[vec->stored] = add;
+	vec->stored++;
+}
+
+void varVectorFree(varVector_t* vec) {
+	for (int i = 0; i < vec->stored; i++) {
+		dict_t *var = &vec->vars[i];
+		if (var->key != NULL) {
+			free(var->key);
+			var->key = NULL;
+		}
+		if (var->value.free)
+			freeDictValue(var->value);
+	}
+	free(vec->vars);
+}

source/tegraexplorer/script/list.h

@@ -0,0 +1,25 @@
+#pragma once
+#include "types.h"
+
+#define dictValSetInt(dictVal, i) dictVal.integer = i; dictVal.type = IntType;
+#define dictValSetStr(dictVal, str) dictVal.string = strdup(str); dictVal.type = StringType;
+#define dictValSetJump(dictVal, i) dictVal.integer = i; dictVal.type = JumpType;
+
+#define dictValInt(i) (dictValue_t) {IntType, 0, i}
+
+#define DictCreate(key, value) (dict_t) {key, value}
+#define DictValueCreate(type, arrayLen, val) (dictValue_t) {type, arrayLen, val}
+
+void freeDictValue(dictValue_t dv);
+void freeDict(dict_t* dict);
+
+varVector_t varVectorInit(int startSize);
+void varVectorAdd(varVector_t* vec, dict_t add);
+dictValue_t* varVectorFind(varVector_t* vec, const char* key);
+
+static inline void freeDictValueOnVar(dictValue_t dv) {
+	if (dv.free)
+		freeDictValue(dv);
+}
+
+void varVectorFree(varVector_t* vec);

source/tegraexplorer/script/parser.c

@@ -1,308 +1,263 @@
+#include "args.h"
+#include "parser.h"
+#include "types.h"
+#include "list.h"
+#include "functions.h"
+#include "scriptCtx.h"
+#include "lexer.h"
 #include <string.h>
 #include "../../mem/heap.h"
-#include "../gfx/gfxutils.h"
-#include "../emmc/emmc.h"
-#include "../../utils/types.h"
-#include "../../libs/fatfs/ff.h"
-#include "../../utils/sprintf.h"
-#include "../../utils/btn.h"
-#include "../../gfx/gfx.h"
-#include "../../utils/util.h"
-#include "../../storage/emummc.h"
-#include "parser.h"
-#include "../common/common.h"
-#include "../fs/fsactions.h"
-#include "functions.h"
-#include "variables.h"
-#include "../fs/fsreader.h"
 #include "../utils/utils.h"
+#include "../../storage/nx_sd.h"
+#include "../../gfx/gfx.h"
+#include "../../hid/hid.h"
+#include "../gfx/gfxutils.h"
 
-u32 countchars(char* in, char target) {
+//#define DPRINTF(str, ...) printf(str, __VA_ARGS__)
-    u32 len = strlen(in);
+#define DPRINTF 
-    u32 count = 0;
+
-    for (u32 i = 0; i < len; i++) {
+#define findNextCharsCtx(ctx, targets) findNextChars(&(ctx->curPos), targets)
-        if (in[i] == '"'){
+
-            i++;
+int checkIfVar(u16 token) {
-            while (in[i] != '"'){
+    return (token == StrLit || token == IntLit || token == Variable || token == RSBracket);
-                i++;
-                if (i >= len)
-                    return -1;
-            }
-        }
-        if (in[i] == target)
-            count++;
-    }
-    return count;
 }
 
-char **argv = NULL;
+void printToken(lexarToken_t* token) {
-u32 argc;
+    switch (token->token) {
-u32 splitargs(char* in) {
+    case 1:
-    // arg like '5, "6", @arg7'
+        gfx_printf("%s ", token->text);
-    u32 i, current = 0, count = 1, len = strlen(in), curcount = 0;
+        break;
-
+    case 6:
-    if ((count += countchars(in, ',')) < 0){
+        //printf("%d: '%s'\n", vec.tokens[i].token, vec.tokens[i].text);
-        return 0;
+        gfx_printf("\"%s\" ", token->text);
+        break;
+    case 7:
+        //printf("%d: %d\n", vec.tokens[i].token, vec.tokens[i].val);
+        gfx_printf("%d ", token->val);
+        break;
+    default:
+        //printf("%d: %c\n", vec.tokens[i].token, lexarDebugGetTokenC(vec.tokens[i].token));
+        gfx_printf("%c ", lexarDebugGetTokenC(token->token));
+        break;
+    }
 }
 
-    /*
+scriptResult_t runFunction(scriptCtx_t* ctx) {
-    if (argv != NULL) {
+    dictValue_t res = solveEquation(ctx, &ctx->script->tokens[ctx->startEq], ctx->curPos - ctx->startEq);
-        for (i = 0; argv[i] != NULL; i++)
+
-            free(argv[i]);
+    if (res.varType == ErrType)
-        free(argv);
+        return scriptResultCreate(res.integer, &ctx->script->tokens[ctx->startEq]);
+
+    ctx->startEq = ctx->curPos;
+    if (ctx->varToken.token != Invalid) { // we should not assign null's
+        ctx->varToken.token = Invalid;
+        if (ctx->varIndexSet) {
+            ctx->varIndexSet = 0;
+            dictValue_t* arrayVal = varVectorFind(&ctx->vars, ctx->varToken.text);
+            if (!(arrayVal == NULL || arrayVal->arrayLen <= ctx->varIndex)) {
+                if (arrayVal->varType == IntArrayType && res.varType == IntType) {
+                    arrayVal->integerArray[ctx->varIndex] = res.integer;
                 }
-    */
+                else if (arrayVal->varType == StringArrayType && res.varType == StringType) {
-        
+                    free(arrayVal->stringArray[ctx->varIndex]);
-    argv = calloc(count + 1, sizeof(char*));
+                    arrayVal->stringArray[ctx->varIndex] = res.string;
-
-    for (i = 0; i < count; i++)
-        argv[i] = calloc(96, sizeof(char));
-    
-
-    for (i = 0; i < len && curcount < count; i++) {
-        if (in[i] == ',') {
-            curcount++;
-            current = 0;
                 }
-        else if (in[i] == '@' || in[i] == '$') {
+                else if (arrayVal->varType == ByteArrayType && res.varType == IntType) {
-            while (strrchr(", )", in[i]) == NULL && i < len) {
+                    arrayVal->byteArray[ctx->varIndex] = (u8)(res.integer & 0xFF);
-                argv[curcount][current++] = in[i++];
                 }
+                else {
+                    return scriptResultCreate(ERRINVALIDTYPE, &ctx->script->tokens[ctx->startEq]);
+                }
+            }
+            else {
+                return scriptResultCreate(ERRNOVAR, &ctx->script->tokens[ctx->startEq]);
+            }
+        }
+        else {
+            varVectorAdd(&ctx->vars, DictCreate(util_cpyStr(ctx->varToken.text), res));
+        }
+    }
+    else {
+        freeDictValueOnVar(res);
+    }
+
+    return scriptResultCreate(0, 0);
+}
+
+// TODO
+// Make sure mem gets free'd properly
+// Fix bug that custom functions cannot be run from end of script
+// add arrays
+
+#define RUNFUNCWITHPANIC(ctx) scriptResult_t res = runFunction(ctx); if (res.resCode != 0) return res
+
+scriptResult_t mainLoop(scriptCtx_t* ctx) {
+    for (ctx->curPos = 0; ctx->curPos < ctx->script->stored; ctx->curPos++) {
+        u32 i = ctx->curPos;
+        lexarToken_t curToken = ctx->script->tokens[i];
+        //printToken(&curToken);
+
+        if (checkIfVar(ctx->lastToken.token) && curToken.token == Variable) {
+            RUNFUNCWITHPANIC(ctx);
+        }
+        else if (curToken.token == Equal) {
+            // Set last var to lastToken, if lastToken is var
+
+            if (ctx->lastToken.token == RSBracket) {
+                int layer = 0;
+                i = ctx->lastTokenPos - 1;
+                for (; i > 0; i--) {
+                    if (ctx->script->tokens[i].token == RSBracket)
+                        layer++;
+                    else if (ctx->script->tokens[i].token == LSBracket) {
+                        if (layer == 0)
+                            break;
+                        layer--;
+                    }
+                }
+
                 i--;
+
+                if (ctx->script->tokens[i].token == Variable) {
+                    dictValue_t index = solveEquation(ctx, &ctx->script->tokens[i + 2], ctx->lastTokenPos - i - 2);
+                    ctx->lastTokenPos = i;
+                    ctx->lastToken = ctx->script->tokens[i];
+
+                    if (index.varType == IntType) {
+                        ctx->varIndex = index.integer;
+                        ctx->varIndexSet = 1;
+
+                        if (ctx->varIndexSet) {
+                            dictValue_t* arrayVal = varVectorFind(&ctx->vars, ctx->varToken.text);
+                            if (arrayVal == NULL) {
+                                return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
                             }
-        //else if ((in[i] >= '0' && in[i] <= '9') || (in[i] >= '<' && in[i] <= '>') || in[i] == '+' || in[i] == '-' || in[i] == '*' || in[i] == '/')
+                           if (ctx->varIndex < 0 || ctx->varIndex >= arrayVal->arrayLen || arrayVal->varType < IntArrayType)
-        else if (strrchr("0123456789<=>+-*/", in[i]) != NULL)
+                               return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
-            argv[curcount][current++] = in[i];
+                        }
-        else if (in[i] == '"') {
+                    }
+                    else
+                        return scriptResultCreate(ERRINVALIDTYPE, &ctx->script->tokens[ctx->curPos]);
+                }
+                else 
+                    return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
+            }
+
+            if (ctx->lastToken.token == Variable) {
+                ctx->startEq = ctx->curPos + 1;
+                ctx->varToken = ctx->lastToken;
+            }
+            else
+                return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
+
+            //printf("Setting token %s to next assignment", ctx->lastToken.text);
+
+            // !! check prev for ] for arrays
+        }
+        else if (curToken.token == LBracket) {
             i++;
-            while (in[i] != '"') {
+            int distance = distanceBetweenTokens(&ctx->script->tokens[i], ctx->script->stored - i, LBracket, RBracket);
-                argv[curcount][current++] = in[i++];
+            if (distance < 0)
-            }
+                return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
-        }
-    }
-    return count;
-}
 
-FIL scriptin;
+            i += distance;
-UINT endByte = 0;
+            ctx->curPos = i;
-int forceExit = false;
-char currentchar = 0;
 
-char getnextchar(){
+            if (ctx->curPos + 1 >= ctx->script->stored && checkIfVar(ctx->lastToken.token)) {
-    f_read(&scriptin, &currentchar, sizeof(char), &endByte);
+                solveEquation(ctx, &ctx->script->tokens[ctx->startEq], i + 1 - ctx->startEq);
-    
-    if (sizeof(char) != endByte)
-        forceExit = true;
-
-    //gfx_printf("|%c|", currentchar);
-    return currentchar;
             }
-
-void getfollowingchar(char end){
-    while (currentchar != end && !f_eof(&scriptin)){
-        if (currentchar == '"'){
-            while (getnextchar() != '"' && !f_eof(&scriptin));
-        }
-        getnextchar();
-    }
-}
-
-void getnextvalidchar(){
-    while ((!((currentchar >= '?' && currentchar <= 'Z') || (currentchar >= 'a' && currentchar <= 'z') || currentchar == '#') && !f_eof(&scriptin)) /*|| currentchar == ';' */)
-        getnextchar();
-}
-
-char *makestr(u32 size, char ignore){
-    char *str;
-    u32 count = 0;
-
-    str = calloc(size + 1, sizeof(char));
-    for (u32 i = 0; i < size; i++){
-        getnextchar();
-        if (ignore != 0 && ignore == currentchar)
             continue;
-                
+        }
-        str[count++] = currentchar;
+        else if (curToken.token == LCBracket) {
+            if (ctx->lastToken.token == Equal && ctx->varToken.token == Variable) {
+                varVectorAdd(&ctx->vars, DictCreate(util_cpyStr(ctx->varToken.text), DictValueCreate(JumpType, 0, ctx->curPos)));
+                ctx->varToken.token = Invalid;
+                setCurIndentInstruction(ctx, 1, -1);
             }
 
-    return str;
+            if (checkIfVar(ctx->lastToken.token)) {
+                RUNFUNCWITHPANIC(ctx);
             }
 
-char *readtilchar(char end, char ignore){
+            ctx->startEq = ctx->curPos + 1;
-    FSIZE_t offset, size;
 
-    offset = f_tell(&scriptin);
+            indentInstructor_t ins = getCurIndentInstruction(ctx);
-    getfollowingchar(end);
+            if (ins.active) {
-    size = f_tell(&scriptin) - offset;
+                if (ins.skip) {
-
+                    int distance = distanceBetweenTokens(&ctx->script->tokens[i + 1], ctx->script->stored - i - 1, LCBracket, RCBracket);
-    if (size <= 0)
+                    if (distance < 0)
-        return NULL;
+                        return scriptResultCreate(ERRSYNTAX, &ctx->script->tokens[ctx->curPos]);
-
+                    ctx->curPos += distance + 1;
-    f_lseek(&scriptin, offset - 1);
+                    ctx->startEq = ctx->curPos + 1;
-
-    return makestr((u32)size, ignore);
-}
-
-
-char *funcbuff = NULL;
-void functionparser(){
-    char *unsplitargs;
-
-    /*
-    if (funcbuff != NULL)
-        free(funcbuff);
-    */
-
-    funcbuff = readtilchar('(', ' ');
-
-    getfollowingchar('(');
-    getnextchar();
-
-    unsplitargs = readtilchar(')', 0);
-
-    if (unsplitargs != NULL){
-        argc = splitargs(unsplitargs);
-        getnextchar();
                 }
                 else {
-        argc = 0;
+                    ctx->indentLevel++;
                 }
-    getnextchar();
+            }
-
+            else
-    free(unsplitargs);
+                return scriptResultCreate(ERRINACTIVEINDENT, &ctx->script->tokens[ctx->curPos]);
+        }
+        else if (curToken.token == RCBracket) {
+            if (checkIfVar(ctx->lastToken.token)) {
+                RUNFUNCWITHPANIC(ctx);
+                if (i != ctx->curPos)
+                    continue;
             }
 
-char *gettargetvar(){
+            ctx->indentLevel--;
-    char *variable = NULL;
 
-    variable = readtilchar('=', ' ');
+            indentInstructor_t ins = getCurIndentInstruction(ctx);
-
+            if (ins.active && ins.jump) {
-    getfollowingchar('=');
+                ctx->curPos = ins.jumpLoc - 1;
-    getnextchar();
-
-    return variable;
             }
 
-void mainparser(){
+            ctx->startEq = ctx->curPos + 1;
-    char *variable = NULL;
+        }
-    int res, out = 0;
+        else if (ctx->curPos + 1 >= ctx->script->stored && checkIfVar(ctx->lastToken.token)) {
+            solveEquation(ctx, &ctx->script->tokens[ctx->startEq], i + 1 - ctx->startEq);
+        }
 
-    getnextvalidchar();
+        ctx->lastToken = ctx->script->tokens[ctx->curPos];
+        ctx->lastTokenPos = ctx->curPos;
+    }
 
-    if (f_eof(&scriptin))
+    return scriptResultCreate(0, 0);
+}
+
+const char* functionFails[] = {
+    "An invalid operation was performed",
+    "Double Nots are not allowed",
+    "A syntax error was found",
+    "The recieved type was incorrect",
+    "The variable could not be found",
+    "The specified function could not be found",
+    "An inactive indent was found"
+};
+
+void startScript(char* path) {
+    char* file = sd_file_read(path, NULL);
+
+    if (file == NULL)
         return;
 
-    if (currentchar == '#'){
-        getfollowingchar('\n');
-        return;
-    }
-
-    if (currentchar == '@'){
-        variable = gettargetvar();
-        getnextvalidchar();
-    }
-
-    /*
-    if (currentchar == '?'){
-        char *jumpname;
-        jumpname = readtilchar(';', ' ');
-        getnextchar();
-        str_jmp_add(jumpname, f_tell(&scriptin));
-        getfollowingchar('\n');
-        return;
-    }
-    */
-
-    functionparser();
-
-    res = run_function(funcbuff, &out);
-    if (res < 0){
-        printerrors = true;
-        //gfx_printf("%s|%s|%d", funcbuff, argv[0], argc);
-        //btn_wait();
-        gfx_errDisplay("mainparser", ERR_PARSE_FAIL, f_tell(&scriptin));
-        forceExit = true;
-        //gfx_printf("Func: %s\nArg1: %s\n", funcbuff, argv[0]);
-    }
-    else {
-        str_int_add("@RESULT", out);
-
-        if (variable != NULL)
-            str_int_add(variable, out);
-    }
-
-    //gfx_printf("\nGoing to next func %c\n", currentchar);
-
-    if (funcbuff != NULL){
-         free(funcbuff);
-         funcbuff = NULL;
-    }
-
-    if (argv != NULL) {
-        for (int i = 0; argv[i] != NULL; i++)
-            free(argv[i]);
-        free(argv);
-        argv = NULL;
-    }
-
-    if (variable != NULL){
-        free(variable);
-    }
-}
-
-void skipbrackets(){
-    u32 bracketcounter = 0;
-
-    getfollowingchar('{');
-    getnextchar();
-
-    while ((currentchar != '}' || bracketcounter != 0) && !f_eof(&scriptin)){
-        if (currentchar == '{')
-            bracketcounter++;
-        else if (currentchar == '}')
-            bracketcounter--;
-
-        getnextchar();
-    }
-}
-
-extern u32 currentcolor;
-extern char *currentpath;
-void runScript(char *path){
-    int res;
-    char *path_local = NULL;
-    forceExit = false;
-    currentchar = 0;
-    currentcolor = COLOR_WHITE;
     gfx_clearscreen();
-    utils_copystring(path, &path_local);
 
-    res = f_open(&scriptin, path, FA_READ | FA_OPEN_EXISTING);
+    scriptCtx_t ctx = createScriptCtx();
-    if (res != FR_OK){
+    lexarVector_t vec = lexarGo(file);
-        gfx_errDisplay("ParseScript", res, 1);
+    free(file);
-        return;
+    ctx.script = &vec;
+
+    scriptResult_t res = mainLoop(&ctx);
+    gfx_printf("end of script\n");
+
+    if (res.resCode) {
+        gfx_printf("[ERROR] %d\n%s\nNear:", res.resCode, functionFails[res.resCode - 1]);
+        printToken(res.nearToken);
     }
    
-    printerrors = false;
+    gfx_printf("\n\n");
-    
+    //mainLoop2(&ctx, &vec);
-    //add builtin vars
+    lexarVectorClear(&vec);
-    str_int_add("@EMUMMC", emu_cfg.enabled);
+    destroyScriptCtx(&ctx);
-    str_int_add("@RESULT", 0);
+    hidWait();
-    str_str_add("$CURRENTPATH", currentpath);
-
-    //str_int_printall();
-
-    while (!f_eof(&scriptin) && !forceExit){
-        mainparser();
-    }
-
-    printerrors = true;
-    //str_int_printall();
-
-    f_close(&scriptin);
-    str_int_clear();
-    //str_jmp_clear();
-    str_str_clear();
-    free(path_local);
-    //btn_wait();
 }

source/tegraexplorer/script/parser.h

@@ -1,5 +1,9 @@
 #pragma once
 
-void runScript(char *path);
+#include "types.h"
-void skipbrackets();
+//#define DictValue(type, val, len) (dictValue_t) {type, len, val}
-void getfollowingchar(char end);
+
+#define scriptResultCreate(resCode, funcName) (scriptResult_t) {resCode, funcName}
+
+void startScript(char* path);
+char* readFile(char* path);

source/tegraexplorer/script/scriptCtx.c

@@ -0,0 +1,37 @@
+#include "scriptCtx.h"
+#include "list.h"
+#include "malloc.h"
+#include "types.h"
+
+scriptCtx_t createScriptCtx() {
+	scriptCtx_t ctx;
+
+	ctx.indentInstructors = calloc(sizeof(indentInstructor_t), 64);
+	ctx.indentLevel = 0;
+	ctx.vars = varVectorInit(16);
+	ctx.script = NULL;
+	ctx.lastToken.token = 0;
+	ctx.varToken.token = 0;
+	ctx.startEq = 0;
+	ctx.varIndexStruct = 0;
+
+	return ctx;
+}
+
+void destroyScriptCtx(scriptCtx_t* ctx) {
+	// TODO
+	varVectorFree(&ctx->vars);
+	free(ctx->indentInstructors);
+}
+
+u8 setIndentInstruction(scriptCtx_t* ctx, u8 level, u8 skip, int jumpLoc) {
+	if (level >= 64)
+		return 1;
+
+	ctx->indentInstructors[level].skip = skip;
+	ctx->indentInstructors[level].active = 1;
+	ctx->indentInstructors[level].jump = (jumpLoc >= 0) ? 1 : 0;
+	ctx->indentInstructors[level].jumpLoc = jumpLoc;
+
+	return 0;
+}

source/tegraexplorer/script/scriptCtx.h

@@ -0,0 +1,19 @@
+#pragma once
+#include "types.h"
+
+#define TEXTHOLDEREMPTY() (textHolder_t) {0}
+#define TEXTHOLDER(start, len) (textHolder_t) {start, len, 1}
+
+u8 setIndentInstruction(scriptCtx_t* ctx, u8 level, u8 skip, int jumpLoc);
+void destroyScriptCtx(scriptCtx_t* ctx);
+scriptCtx_t createScriptCtx();
+static inline indentInstructor_t getCurIndentInstruction(scriptCtx_t* ctx);
+static inline u8 setCurIndentInstruction(scriptCtx_t* ctx, u8 skip, int jumpLoc);
+
+static inline u8 setCurIndentInstruction(scriptCtx_t* ctx, u8 skip, int jumpLoc) {
+	return setIndentInstruction(ctx, ctx->indentLevel, skip, jumpLoc);
+}
+
+static inline indentInstructor_t getCurIndentInstruction(scriptCtx_t* ctx) {
+	return ctx->indentInstructors[ctx->indentLevel];
+}

source/tegraexplorer/script/types.h

@@ -0,0 +1,174 @@
+#pragma once
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+typedef struct {
+	u16 token;
+	union {
+		char* text;
+		int val;
+	};
+} lexarToken_t;
+
+typedef struct {
+	lexarToken_t* tokens;
+	u32 len;
+	u32 stored;
+} lexarVector_t;
+
+enum Tokens {
+	Invalid = 0,
+	Variable = 1,
+	LBracket,
+	RBracket,
+	RCBracket,
+	LCBracket,
+	StrLit,
+	IntLit,
+	Seperator,
+	Plus,
+	Minus,
+	Multiply,
+	Division,
+	Mod,
+	Smaller,
+	SmallerEqual,
+	Bigger,
+	BiggerEqual,
+	Equal,
+	EqualEqual,
+	Not,
+	NotEqual,
+	LogicAND,
+	LogicOR,
+	LSBracket,
+	RSBracket,
+	AND,
+	OR
+};
+
+enum Errors {
+	ERRBADOPERATOR = 1,
+	ERRDOUBLENOT,
+	ERRSYNTAX,
+	ERRINVALIDTYPE,
+	ERRNOVAR,
+	ERRNOFUNC,
+	ERRINACTIVEINDENT
+};
+
+typedef struct { // this is to keep track of how many {} we passed. Keep an internal var with the "indentation level", +1 for {, -1 for }. have an array with the following def on what to do (on func: enter, set indentation & jump back, on while, jump to while, use while as if, on if simply set true or false)
+	union {
+		struct {
+			u8 active : 1;
+			u8 skip : 1;
+			u8 jump : 1;
+		};
+		u8 container;
+	};
+	int jumpLoc;
+} indentInstructor_t;
+
+typedef struct {
+	char* start;
+	u32 len;
+	union {
+		struct {
+			u8 set : 1;
+		};
+		u8 options;
+	};
+} textHolder_t;
+
+typedef struct {
+	int resCode;
+	lexarToken_t* nearToken;
+} scriptResult_t;
+
+#define JumpDictValue(jump) (dictValue_t) {{JumpType}, 0, .integer = jump}
+#define StrDictValue(str) (dictValue_t) {{StringType}, 0, .string = str}
+#define ErrDictValue(err) (dictValue_t) {{ErrType}, 0, .integer = err}
+#define NullDictValue() (dictValue_t) {{NullType}, 0, .integer = 0}
+#define IntArrDictValue(arr, len) (dictValue_t) {{IntArrayType}, len, .integerArray = arr}
+#define StringArrDictValue(arr, len) (dictValue_t) {{StringArrayType}, len, .stringArray = arr}
+#define IntDictValue(i) (dictValue_t) {{IntType}, 0, .integer = i}
+
+enum {
+	IntType = 0,
+	StringType,
+	IntArrayType,
+	StringArrayType,
+	ByteArrayType,
+	JumpType,
+	DictType,
+	NullType,
+	ErrType,
+};
+
+typedef struct {
+	union {
+		u8 type;
+		struct {
+			u8 varType : 7;
+			u8 free : 1;
+		};
+	};
+	unsigned int arrayLen;
+	union {
+		int integer;
+		char* string;
+		unsigned char* byteArray;
+		int* integerArray;
+		char** stringArray;
+	};
+} dictValue_t;
+
+typedef struct {
+	char* key;
+	dictValue_t value;
+} dict_t;
+
+typedef struct {
+	dict_t* vars;
+	u32 len;
+	u32 stored;
+} varVector_t;
+
+typedef struct {
+	indentInstructor_t* indentInstructors;
+	u8 indentLevel; // -> max 63
+	varVector_t vars;
+	lexarVector_t* script;
+	lexarToken_t lastToken;
+	lexarToken_t varToken;
+	u32 startEq;
+	u32 curPos;
+	u32 lastTokenPos;
+	lexarVector_t args_loc;
+	union {
+		u32 varIndexStruct;
+		struct {
+			u32 varIndex : 31;
+			u32 varIndexSet : 1;
+		};
+	};
+} scriptCtx_t;
+
+typedef dictValue_t(*func_int_ptr)(scriptCtx_t* ctx, varVector_t* args);
+
+typedef struct {
+	char* key;
+	func_int_ptr value;
+	union {
+		u8 args;
+		struct {
+			u8 argCount : 6;
+			u8 varArgs : 1;
+			u8 operatorParse : 1;
+		};
+	};
+} str_fnc_struct;
+
+#define FREEINDICT 0x80

source/tegraexplorer/script/variables.c

@@ -1,250 +0,0 @@
-#include <string.h>
-#include "../../mem/heap.h"
-#include "../gfx/gfxutils.h"
-#include "../emmc/emmc.h"
-#include "../../utils/types.h"
-#include "../../libs/fatfs/ff.h"
-#include "../../utils/sprintf.h"
-#include "../../utils/btn.h"
-#include "../../gfx/gfx.h"
-#include "../../utils/util.h"
-#include "../../storage/emummc.h"
-#include "parser.h"
-#include "../common/common.h"
-#include "../fs/fsactions.h"
-#include "variables.h"
-#include "../utils/utils.h"
-
-static dict_str_int *str_int_table = NULL;
-static dict_str_str *str_str_table = NULL;
-//static dict_str_loc *str_jmp_table = NULL;
-
-int str_int_add(char *key, int value){
-    char *key_local;
-    dict_str_int *keyvaluepair;
-
-    utils_copystring(key, &key_local);
-    
-    keyvaluepair = calloc(1, sizeof(dict_str_int));
-    keyvaluepair->key = key_local;
-    keyvaluepair->value = value;
-    keyvaluepair->next = NULL;
-
-    if (str_int_table == NULL){
-        str_int_table = keyvaluepair;
-    }
-    else {
-        dict_str_int *temp;
-        temp = str_int_table;
-        while (temp != NULL){
-            if (!strcmp(temp->key, key_local)){
-                free(keyvaluepair);
-                free(key_local);
-                temp->value = value;
-                return 0;
-            }
-
-            if (temp->next == NULL){
-                temp->next = keyvaluepair;
-                return 0;
-            }
-
-            temp = temp->next;
-        }
-    }
-
-    return 0;
-}
-
-int str_int_find(char *key, int *out){
-    dict_str_int *temp;
-    temp = str_int_table;
-    while (temp != NULL){
-        if (!strcmp(temp->key, key)){
-            *out = temp->value;
-            return 0;
-        }
-        temp = temp->next;
-    }
-
-    return -1;
-}
-
-void str_int_clear(){
-    dict_str_int *cur, *next;
-    cur = str_int_table;
-
-    while (cur != NULL){
-        next = cur->next;
-        free(cur->key);
-        free(cur);
-        cur = next;
-    }
-    str_int_table = NULL;
-}
-
-void str_int_printall(){
-    dict_str_int *temp;
-    temp = str_int_table;
-    while (temp != NULL){
-        gfx_printf("%s -> %d\n", temp->key, temp->value);
-        temp = temp->next;
-    }
-}
-/*
-int str_jmp_add(char *key, u64 value){
-    char *key_local;
-    dict_str_loc *keyvaluepair;
-
-    //gfx_printf("Adding |%s|\n", key_local);
-
-    utils_copystring(key, &key_local);
-
-    keyvaluepair = calloc(1, sizeof(dict_str_loc));
-    keyvaluepair->key = key_local;
-    keyvaluepair->value = value;
-    keyvaluepair->next = NULL;
-    
-    if (str_jmp_table == NULL){
-        str_jmp_table = keyvaluepair;
-    }
-    else {
-        dict_str_loc *temp;
-        temp = str_jmp_table;
-        while (temp != NULL){
-            if (!strcmp(temp->key, key_local)){
-                free(keyvaluepair);
-                free(key_local);
-
-                temp->value = value;
-                return 0;
-            }
-
-            if (temp->next == NULL){
-                temp->next = keyvaluepair;
-                return 0;
-            }
-
-            temp = temp->next;
-        }
-    }
-
-    return 0;
-}
-
-int str_jmp_find(char *key, u64 *out){
-    dict_str_loc *temp;
-    temp = str_jmp_table;
-    //gfx_printf("Searching |%s|\n", key);
-    while (temp != NULL){
-        if (!strcmp(temp->key, key)){
-            //gfx_printf("Key found!\n", temp->value);
-            *out = temp->value;
-            return 0;
-        }
-        temp = temp->next;
-    }
-
-    //gfx_printf("no key!\n");
-    return -1;
-}
-
-void str_jmp_clear(){
-    dict_str_loc *cur, *next;
-    cur = str_jmp_table;
-
-    while (cur != NULL){
-        next = cur->next;
-        free(cur->key);
-        free(cur);
-        cur = next;
-    }
-    str_jmp_table = NULL;
-}
-*/
-
-int str_str_add(char *key, char *value){
-    char *key_local, *value_local;
-    dict_str_str *keyvaluepair;
-    //gfx_printf("Adding |%s|\n", key_local);
-    utils_copystring(value, &value_local);
-    utils_copystring(key, &key_local);
-
-    keyvaluepair = calloc(1, sizeof(dict_str_str));
-    keyvaluepair->key = key_local;
-    keyvaluepair->value = value_local;
-    keyvaluepair->next = NULL;
-    
-    if (str_str_table == NULL){
-        str_str_table = keyvaluepair;
-    }
-    else {
-        dict_str_str *temp;
-        temp = str_str_table;
-        while (temp != NULL){
-            if (!strcmp(temp->key, key_local)){
-                free(keyvaluepair);
-                free(key_local);
-                
-                free(temp->value);
-                temp->value = value_local;
-                return 0;
-            }
-
-            if (temp->next == NULL){
-                temp->next = keyvaluepair;
-                return 0;
-            }
-
-            temp = temp->next;
-        }
-    }
-
-    return 0;
-}
-
-int str_str_find(char *key, char **out){
-    dict_str_str *temp;
-    temp = str_str_table;
-
-    while (temp != NULL){
-        if (!strcmp(temp->key, key)){
-            *out = temp->value;
-            return 0;
-        }
-        temp = temp->next;
-    }
-
-    return -1;
-}
-
-int str_str_index(int index, char **out){
-    dict_str_str *temp;
-    temp = str_str_table;
-
-    for (int i = 0; i < index; i++){
-        if (temp == NULL)
-            return -1;
-        temp = temp->next;
-    }
-
-    if (temp == NULL)
-        return -1;
-
-    *out = temp->value;
-    return 0;
-}
-
-void str_str_clear(){
-    dict_str_str *cur, *next;
-    cur = str_str_table;
-
-    while (cur != NULL){
-        next = cur->next;
-        free(cur->key);
-        free(cur->value);
-        free(cur);
-        cur = next;
-    }
-    str_str_table = NULL;
-}

source/tegraexplorer/script/variables.h

@@ -1,34 +0,0 @@
-#pragma once
-#include "../../utils/types.h"
-
-typedef struct _dict_str_int {
-    char *key;
-    int value;
-    struct _dict_str_int *next;
-} dict_str_int;
-
-typedef struct _dict_str_str {
-    char *key;
-    char *value;
-    struct _dict_str_str *next;
-} dict_str_str;
-
-typedef struct _dict_str_loc {
-    char *key;
-    u64 value;
-    struct _dict_str_loc *next;
-} dict_str_loc;
-
-int str_int_add(char *key, int value);
-int str_int_find(char *key, int *out);
-void str_int_clear();
-void str_int_printall();
-/*
-int str_jmp_add(char *key, u64 value);
-int str_jmp_find(char *key, u64 *out);
-void str_jmp_clear();
-*/
-int str_str_add(char *key, char *value);
-int str_str_find(char *key, char **out);
-int str_str_index(int index, char **out);
-void str_str_clear();

source/tegraexplorer/utils/tools.c

@@ -17,6 +17,7 @@
 #include "../fs/fsutils.h"
 #include "../../mem/heap.h"
 #include "../utils/utils.h"
+#include "../fs/nca.h"
 
 extern bool sd_mount();
 extern void sd_unmount();
@@ -93,7 +94,9 @@ void displaygpio(){
     }
 }
 
-int dumpfirmware(int mmc){
+
+// bad code ahead aaaa
+int dumpfirmware(int mmc, bool daybreak){
     DIR dir;
     FILINFO fno;
     bool fail = false;
@@ -107,6 +110,22 @@ int dumpfirmware(int mmc){
     connect_mmc(mmc);
     mount_mmc("SYSTEM", 2);
 
+    if (daybreak){
+        if (!fsutil_checkfile("sd:/switch/prod.keys")){
+            SWAPCOLOR(COLOR_RED);
+            gfx_printf("prod.keys not found.\nPress any button to exit");
+            hidWait();
+            return true;
+        }
+
+        if (SetHeaderKey()){
+            SWAPCOLOR(COLOR_RED);
+            gfx_printf("Failed to find header key.\nPress any button to exit");
+            hidWait();
+            return true;
+        }
+    }
+
     gfx_printf("PKG1 version: %d\n", pkg1.ver);
 
     gfx_printf("Creating folders...\n");
@@ -115,7 +134,24 @@ int dumpfirmware(int mmc){
 
     sdbase = calloc(32 + strlen(pkg1.id), sizeof(char));
     sprintf(sdbase, "sd:/tegraexplorer/Firmware/%d (%s)", pkg1.ver, pkg1.id);
-    gfx_printf("Out: %s\n", sdbase);
+
+    if (fsutil_checkfile(sdbase)){
+        SWAPCOLOR(COLOR_RED);
+        gfx_printf("Destination folder already exists.\nPress X to delete this folder, any other button to cancel\nPath: %s", sdbase);
+        
+        Inputs *input = hidWait();
+        if (!input->x){
+            free(sdbase);
+            return true;
+        }
+        else {
+            SWAPCOLOR(COLOR_WHITE);
+            gfx_printf("\nDeleting folder..\n");
+            fsact_del_recursive(sdbase);
+        }
+    }
+
+    gfx_printf("\rOut: %s\n", sdbase);
     f_mkdir(sdbase);
 
     if ((ret = f_opendir(&dir, sysbase)))
@@ -127,16 +163,39 @@ int dumpfirmware(int mmc){
     printerrors = 0;
 
     while(!f_readdir(&dir, &fno) && fno.fname[0] && !fail){
-        utils_copystring(fsutil_getnextloc(sdbase, fno.fname), &sdpath);
         utils_copystring(fsutil_getnextloc(sysbase, fno.fname), &syspathtemp);
     
         if (fno.fattrib & AM_DIR){
             utils_copystring(fsutil_getnextloc(syspathtemp, "00"), &syspath);
-            free(syspathtemp);
         }
         else
             syspath = syspathtemp;
 
+        if (daybreak){
+            u8 ContentType = GetNcaType(syspath);
+
+            if (ContentType < 0){
+                fail = true;
+                continue;
+            }
+
+            char *temp;
+            utils_copystring(fsutil_getnextloc(sdbase, fno.fname), &temp);
+            
+            if (ContentType == 0x01){
+                sdpath = calloc(strlen(temp) + 6, 1);
+                strcpy(sdpath, temp);
+                memcpy(sdpath + strlen(temp) - 4, ".cnmt.nca", 10);
+                free(temp);
+            }
+            else {
+                sdpath = temp;
+            }
+        }
+        else
+            utils_copystring(fsutil_getnextloc(sdbase, fno.fname), &sdpath);
+
+
         ret = fsact_copy(syspath, sdpath, 0);
 
         gfx_printf("%d %s\r", ++amount, fno.fname);
@@ -145,6 +204,8 @@ int dumpfirmware(int mmc){
             fail = true;
 
         free(sdpath);
+        free(syspathtemp);
+        if (syspath != syspathtemp)
             free(syspath);
     }
 
@@ -159,7 +220,7 @@ int dumpfirmware(int mmc){
 
     return fail;
 }
-
+/*
 void dumpusersaves(int mmc){
     connect_mmc(mmc);
     mount_mmc("USER", 2);
@@ -180,6 +241,7 @@ void dumpusersaves(int mmc){
     gfx_printf("Press any key to continue");
     hidWait();
 }
+*/
 
 int format(int mode){
     gfx_clearscreen();

source/tegraexplorer/utils/tools.h

@@ -1,7 +1,7 @@
 #pragma once
+#include "../../utils/types.h"
 
 void displayinfo();
 void displaygpio();
 int format(int mode);
-int dumpfirmware(int mmc);
+int dumpfirmware(int mmc, bool daybreak);
-void dumpusersaves(int mmc);

source/tegraexplorer/utils/utils.c

@@ -193,3 +193,19 @@ char *utils_InputText(char *start, int maxLen){
 
     return buff;
 }
+
+char *utils_copyStringSize(const char *in, int size){
+    if (size > strlen(in) || size < 0)
+        size = strlen(in);
+
+    char *out = calloc(size + 1, 1);
+    //strncpy(out, in, size);
+    memcpy(out, in, size);
+    return out;
+}
+
+char* util_cpyStr(const char* in){
+    char *out = malloc(strlen(in) + 1);
+    strcpy(out, in);
+    return out;
+}

source/tegraexplorer/utils/utils.h

@@ -24,3 +24,5 @@ int utils_mmcMenu();
 void utils_copystring(const char *in, char **out);
 char *utils_InputText(char *start, int maxLen);
 void utils_takeScreenshot();
+char *utils_copyStringSize(const char *in, int size);
+char* util_cpyStr(const char* in);