Move maybe_print_custom_stack into libhl

Author: yuxiaomao

src/hl.h

@@ -642,6 +642,7 @@ HL_API HL_NO_RETURN( void hl_null_access( void ) );
 HL_API void hl_setup_longjump( void *j );
 HL_API void hl_setup_exception( void *resolve_symbol, void *capture_stack );
 HL_API void hl_dump_stack( void );
+HL_API bool hl_maybe_print_custom_stack( vdynamic* ret );
 HL_API varray *hl_exception_stack( void );
 HL_API bool hl_detect_debugger( void );
 

src/hlc_main.c

@@ -148,26 +148,6 @@ static int throw_handler( int code ) {
 }
 #endif
 
-bool maybe_print_custom_stack( vdynamic* ret ) {
-	hl_type* exct = ret->t;
-	while( exct->kind == HOBJ ) {
-		if( exct->obj->super == NULL ) {
-			if( ucmp(exct->obj->name, USTR("haxe.Exception")) == 0 ) {
-				hl_field_lookup* f = hl_lookup_find(exct->obj->rt->lookup, exct->obj->rt->nlookup, hl_hash_gen(USTR("__customStack"), true));
-				if( f == NULL || f->field_index < 0 ) break;
-				vdynamic* customStack = *(vdynamic**)((char*)(ret) + f->field_index);
-				if( customStack != NULL ) {
-					uprintf(USTR("Custom stack:%s\n"), hl_to_string(customStack));
-					return true;
-				}
-			}
-			break;
-}
-		exct = exct->obj->super;
-	}
-	return false;
-}
-
 #ifdef HL_WIN_DESKTOP
 int wmain(int argc, uchar *argv[]) {
 #else
@@ -192,7 +172,7 @@ int main(int argc, char *argv[]) {
 	ret = hl_dyn_call_safe(&cl, NULL, 0, &isExc);
 	if( isExc ) {
 		uprintf(USTR("Uncaught exception: %s\n"), hl_to_string(ret));
-		if( !maybe_print_custom_stack(ret) ) {
+		if( !hl_maybe_print_custom_stack(ret) ) {
 			varray *a = hl_exception_stack();
 			int i;
 			for( i = 0; i < a->size; i++ )

src/main.c

@@ -133,26 +133,6 @@ static void setup_handler() {
 }
 #endif
 
-bool maybe_print_custom_stack( vdynamic* ret ) {
-	hl_type* exct = ret->t;
-	while( exct->kind == HOBJ ) {
-		if( exct->obj->super == NULL ) {
-			if( ucmp(exct->obj->name, USTR("haxe.Exception")) == 0 ) {
-				hl_field_lookup* f = hl_lookup_find(exct->obj->rt->lookup, exct->obj->rt->nlookup, hl_hash_gen(USTR("__customStack"), true));
-				if( f == NULL || f->field_index < 0 ) break;
-				vdynamic* customStack = *(vdynamic**)((char*)(ret) + f->field_index);
-				if( customStack != NULL ) {
-					uprintf(USTR("Custom stack:%s\n"), hl_to_string(customStack));
-					return true;
-				}
-			}
-			break;
-		}
-		exct = exct->obj->super;
-	}
-	return false;
-}
-
 #ifdef HL_WIN
 int wmain(int argc, pchar *argv[]) {
 #else
@@ -261,8 +241,8 @@ int main(int argc, pchar *argv[]) {
 	hl_profile_end();
 	if( isExc ) {
 		uprintf(USTR("Uncaught exception: %s\n"), hl_to_string(ctx.ret));
-		if( !maybe_print_custom_stack(ctx.ret) ) {
-			varray* a = hl_exception_stack();
+		if( !hl_maybe_print_custom_stack(ctx.ret) ) {
+			varray *a = hl_exception_stack();
 			int i;
 			for( i = 0; i < a->size; i++ )
 				uprintf(USTR("Called from %s\n"), hl_aptr(a, uchar*)[i]);

src/std/error.c

@@ -142,6 +142,26 @@ HL_PRIM void hl_dump_stack() {
 	fflush(stdout);
 }
 
+HL_PRIM bool hl_maybe_print_custom_stack( vdynamic* ret ) {
+	hl_type* exct = ret->t;
+	while( exct->kind == HOBJ ) {
+		if( exct->obj->super == NULL ) {
+			if( ucmp(exct->obj->name, USTR("haxe.Exception")) == 0 ) {
+				hl_field_lookup* f = hl_lookup_find(exct->obj->rt->lookup, exct->obj->rt->nlookup, hl_hash_gen(USTR("__customStack"), true));
+				if( f == NULL || f->field_index < 0 ) break;
+				vdynamic* customStack = *(vdynamic**)((char*)(ret) + f->field_index);
+				if( customStack != NULL ) {
+					uprintf(USTR("%s\n"), hl_to_string(customStack));
+					return true;
+				}
+			}
+			break;
+		}
+		exct = exct->obj->super;
+	}
+	return false;
+}
+
 HL_PRIM varray *hl_exception_stack() {
 	hl_thread_info *t = hl_get_thread();
 	varray *a = hl_alloc_array(&hlt_bytes, t->exc_stack_count);