From 1358d7037af1a0006f89114eb3b15b1071a9a974 Mon Sep 17 00:00:00 2001 From: Joao Date: Wed, 4 May 2011 10:21:47 +0100 Subject: [PATCH] remove LOCAL_FormatInfo e LOCAL_DelayArenaOverflows from LOCALS. --- H/dlocals.h | 2 -- H/hlocals.h | 2 -- H/ilocals.h | 2 -- H/rlocals.h | 2 -- misc/LOCALS | 2 -- 5 files changed, 10 deletions(-) diff --git a/H/dlocals.h b/H/dlocals.h index ded679352..ae1f71c0c 100644 --- a/H/dlocals.h +++ b/H/dlocals.h @@ -48,13 +48,11 @@ #define LOCAL_GlobalArena WL->global_arena #define LOCAL_GlobalArenaOverflows WL->global_arena_overflows -#define LOCAL_DelayArenaOverflows WL->delay_arena_overflows #define LOCAL_ArenaOverflows WL->arena_overflows #define LOCAL_DepthArenas WL->depth_arenas #define LOCAL_ArithError WL->arith_error #define LOCAL_LastAssertedPred WL->last_asserted_pred #define LOCAL_DebugOn WL->debug_on -#define LOCAL_FormatInfo WL->f_info #define LOCAL_ScannerStack WL->scanner_stack #define LOCAL_ScannerExtraBlocks WL->scanner_extra_blocks #define LOCAL_BallTerm WL->ball_term diff --git a/H/hlocals.h b/H/hlocals.h index 6e08f7af2..8467361ff 100644 --- a/H/hlocals.h +++ b/H/hlocals.h @@ -50,13 +50,11 @@ typedef struct worker_local { Term global_arena; UInt global_arena_overflows; - Int delay_arena_overflows; Int arena_overflows; Int depth_arenas; int arith_error; struct pred_entry* last_asserted_pred; int debug_on; - struct format_status* f_info; char* scanner_stack; struct scanner_extra_alloc* scanner_extra_blocks; struct DB_TERM *ball_term; diff --git a/H/ilocals.h b/H/ilocals.h index d616757ae..67f127076 100644 --- a/H/ilocals.h +++ b/H/ilocals.h @@ -48,13 +48,11 @@ static void InitWorker(int wid) { FOREIGN(wid)->global_arena = 0L; FOREIGN(wid)->global_arena_overflows = 0L; - FOREIGN(wid)->delay_arena_overflows = 0L; FOREIGN(wid)->arena_overflows = 0L; FOREIGN(wid)->depth_arenas = 0; FOREIGN(wid)->arith_error = FALSE; FOREIGN(wid)->last_asserted_pred = NULL; FOREIGN(wid)->debug_on = FALSE; - FOREIGN(wid)->f_info = NULL; FOREIGN(wid)->scanner_stack = NULL; FOREIGN(wid)->scanner_extra_blocks = NULL; FOREIGN(wid)->ball_term = NULL; diff --git a/H/rlocals.h b/H/rlocals.h index 39d783c70..83713a8fd 100644 --- a/H/rlocals.h +++ b/H/rlocals.h @@ -55,8 +55,6 @@ static void RestoreWorker(int wid USES_REGS) { - - RestoreBallTerm(wid); diff --git a/misc/LOCALS b/misc/LOCALS index 214f5e4f5..b51a21a92 100644 --- a/misc/LOCALS +++ b/misc/LOCALS @@ -52,14 +52,12 @@ union CONSULT_OBJ* consultlow LOCAL_ConsultLow =NULL //global variables Term global_arena LOCAL_GlobalArena =0L TermToGlobalOrAtomAdjust UInt global_arena_overflows LOCAL_GlobalArenaOverflows =0L -Int delay_arena_overflows LOCAL_DelayArenaOverflows =0L Int arena_overflows LOCAL_ArenaOverflows =0L Int depth_arenas LOCAL_DepthArenas =0 int arith_error LOCAL_ArithError =FALSE struct pred_entry* last_asserted_pred LOCAL_LastAssertedPred =NULL int debug_on LOCAL_DebugOn =FALSE -struct format_status* f_info LOCAL_FormatInfo =NULL char* scanner_stack LOCAL_ScannerStack =NULL struct scanner_extra_alloc* scanner_extra_blocks LOCAL_ScannerExtraBlocks =NULL struct DB_TERM *ball_term LOCAL_BallTerm =NULL RestoreBallTerm(wid)