improve sgx debugger support

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

Makefile

@@ -1,11 +1,13 @@
 ######## LCP Build Settings ########
 ZK_PROVER_CUDA ?= 0
 APP_CARGO_FLAGS ?=
+DEBUG ?= 0
+OUTPUT_PATH := release
+CARGO_TARGET := --release
 
 ######## SGX SDK Settings ########
 SGX_SDK ?= /opt/sgxsdk
 SGX_MODE ?= HW
-SGX_DEBUG ?= 0
 SGX_ENCLAVE_CONFIG ?= "enclave/Enclave.config.xml"
 SGX_SIGN_KEY ?= "enclave/Enclave_private.pem"
 
@@ -16,16 +18,13 @@ SGX_EDGER8R := $(SGX_SDK)/bin/x64/sgx_edger8r
 
 include buildenv.mk
 
-ifeq ($(SGX_DEBUG), 1)
-	# we build with cargo --release, even in SGX DEBUG mode
+ifeq ($(DEBUG), 1)
 	SGX_COMMON_CFLAGS += -O0 -g -ggdb
-	# cargo sets this automatically, cannot use 'debug'
-	OUTPUT_PATH := release
-	CARGO_TARGET := --release
+	OUTPUT_PATH := debug
+	CARGO_TARGET :=
+	export SGX_DEBUG = 1
 else
 	SGX_COMMON_CFLAGS += -O2
-	OUTPUT_PATH := release
-	CARGO_TARGET := --release
 endif
 
 SGX_COMMON_CFLAGS += -fstack-protector

enclave/Enclave.lds

@@ -4,6 +4,8 @@ enclave.so
         g_global_data_sim;
         g_global_data;
         enclave_entry;
+        g_peak_heap_used;
+        g_peak_rsrv_mem_committed;
     local:
         *;
 };