From c95f2a7ad520a7bc48c66cb16e890769ab35e2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Tue, 31 Jan 2023 07:17:18 +0100 Subject: [PATCH] 2023-01-31 07:17 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/fm.c * src/vm/garbage.c ! pacified warnings --- ChangeLog.txt | 5 +++++ src/vm/fm.c | 11 +++++++++-- src/vm/garbage.c | 7 +++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6f1804c118..13bae10512 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,11 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2023-01-31 07:17 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/vm/fm.c + * src/vm/garbage.c + ! pacified warnings + 2023-01-30 15:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/arc4.c ! include hbarc4.h instead of arc4.h which does not contain diff --git a/src/vm/fm.c b/src/vm/fm.c index eeaca9cbfc..283f7e4ff4 100644 --- a/src/vm/fm.c +++ b/src/vm/fm.c @@ -506,8 +506,9 @@ static void dlmalloc_destroy( void ) void hb_xinit_thread( void ) { #if defined( HB_FM_DLMT_ALLOC ) +#if defined( hb_stack ) HB_STACK_TLS_PRELOAD - +#endif if( hb_stack.allocator == NULL ) { HB_FM_LOCK(); @@ -520,7 +521,9 @@ void hb_xinit_thread( void ) void hb_xexit_thread( void ) { #if defined( HB_FM_DLMT_ALLOC ) +#if defined( hb_stack ) HB_STACK_TLS_PRELOAD +#endif PHB_MSPACE pm = ( PHB_MSPACE ) hb_stack.allocator; if( pm ) @@ -1502,7 +1505,9 @@ HB_SIZE hb_xquery( int iMode ) case HB_MEM_STACK_TOP: /* Harbour extension (Total items currently on the stack) */ { +#if defined( hb_stackTopOffset ) HB_STACK_TLS_PRELOAD +#endif nResult = hb_stackTopOffset(); break; } @@ -1544,7 +1549,9 @@ HB_BOOL hb_xtraced( void ) HB_FUNC( __FM_ALLOCLIMIT ) { - HB_STACK_TLS_PRELOAD; +#if defined( hb_retns ) || defined( hb_retni ) + HB_STACK_TLS_PRELOAD +#endif hb_xclean(); #if defined( HB_FM_DLMT_ALLOC ) hb_retns( mspace_footprint_limit( hb_mspace() ) ); diff --git a/src/vm/garbage.c b/src/vm/garbage.c index 0c3cf7b0b1..cb8539dd9e 100644 --- a/src/vm/garbage.c +++ b/src/vm/garbage.c @@ -768,7 +768,9 @@ HB_FUNC( HB_GCSTEP ) */ HB_FUNC( HB_GCALL ) { +#if defined( hb_ret ) HB_STACK_TLS_PRELOAD +#endif /* call hb_ret() to clear stack return item, HVM does not clean * it before calling functions/procedures if caller does not @@ -786,10 +788,11 @@ HB_FUNC( HB_GCALL ) #ifdef HB_GC_AUTO HB_FUNC( HB_GCSETAUTO ) { - HB_STACK_TLS_PRELOAD - HB_PTRUINT nBlocks, nPrevBlocks; HB_BOOL fSet = HB_ISNUM( 1 ); +#if defined( hb_retnint ) + HB_STACK_TLS_PRELOAD +#endif nBlocks = fSet ? hb_parnint( 1 ) * 1000 : 0;