Menu
▾
▴
[Xsb-commits] CVS: XSB/emu README,1.9,1.10 choice.h,1.27,1.28 cut_xsb.h,1.18,1.19 init_xsb.c,1.82,1.83 memory_xsb.h,1.27,1.28 thread_xsb.c,1.35,1.36 thread_xsb.h,1.14,1.15
|
From: Terrance S. <ts...@us...> - 2006-01-27 20:30:08
|
Update of /cvsroot/xsb/XSB/emu In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20959 Modified Files: README choice.h cut_xsb.h init_xsb.c memory_xsb.h thread_xsb.c thread_xsb.h Log Message: Some changes I recently made broke batched evaluation. I backed out these changes to fix the batched test suite again. Index: README =================================================================== RCS file: /cvsroot/xsb/XSB/emu/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- README 24 Jan 2006 14:10:00 -0000 1.9 +++ README 27 Jan 2006 20:29:42 -0000 1.10 @@ -132,7 +132,6 @@ stream_record open_files[55]; -- controlled by MUTEX_IO File loader_xsb.c - Psc global_mod; struct TDispBlkHdr_t tdispblkhdr; struct tif_list tif_list; static pseg current_seg; Index: choice.h =================================================================== RCS file: /cvsroot/xsb/XSB/emu/choice.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- choice.h 26 Dec 2005 17:17:19 -0000 1.27 +++ choice.h 27 Jan 2006 20:29:43 -0000 1.28 @@ -353,14 +353,14 @@ #define SAVE_CSFPSC(b) #endif -/* -| #define is_compl_susp_frame(b) \ -| ((cp_pcreg(b) == (byte *) &resume_compl_suspension_inst) || \ -| (cp_pcreg(b) == (byte *) &resume_compl_suspension_inst2)) -*/ +#define is_compl_susp_frame(b) \ + ((cp_pcreg(b) == (byte *) &resume_compl_suspension_inst) || \ + (cp_pcreg(b) == (byte *) &resume_compl_suspension_inst2)) +/* #define is_compl_susp_frame(b) \ ((cp_pcreg(b) == (byte *) &resume_compl_suspension_inst)) +*/ #define save_compl_susp_frame(t_breg,t_ereg,subg,t_ptcp,CPREG) \ t_breg -= CSF_SIZE; \ @@ -438,9 +438,7 @@ cs_compsuspptr(t_breg) = compsuspptr;\ cs_hreg(t_breg) = hreg; \ cs_ebreg(t_breg) = ebreg; \ - cs_pcreg(t_breg) = (pb) &resume_compl_suspension_inst - -// cs_pcreg(t_breg) = (pb) &resume_compl_suspension_inst2 + cs_pcreg(t_breg) = (pb) &resume_compl_suspension_inst2 /* -------------------------------------------------------------------- */ Index: cut_xsb.h =================================================================== RCS file: /cvsroot/xsb/XSB/emu/cut_xsb.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cut_xsb.h 24 Jan 2006 14:10:01 -0000 1.18 +++ cut_xsb.h 27 Jan 2006 20:29:46 -0000 1.19 @@ -108,12 +108,21 @@ #define cut_restore_trail_condition_registers(CUTB) \ if ((CPtr) *CUTB >= (CPtr) pdl.low || \ *CUTB == (Cell) &answer_return_inst || \ - *CUTB == (Cell) &resume_compl_suspension_inst) { \ + *CUTB == (Cell) &resume_compl_suspension_inst ||\ + *CUTB == (Cell) &resume_compl_suspension_inst2) { \ ebreg = cp_ebreg(CUTB); \ hbreg = cp_hreg(CUTB); \ } - // *CUTB == (Cell) &resume_compl_suspension_inst2) { +/* +#define cut_restore_trail_condition_registers(CUTB) \ + if ((CPtr) *CUTB >= (CPtr) pdl.low || \ + *CUTB == (Cell) &answer_return_inst || \ + *CUTB == (Cell) &resume_compl_suspension_inst) { \ + ebreg = cp_ebreg(CUTB); \ + hbreg = cp_hreg(CUTB); \ + } +*/ /*----------------------------------------------------------------------*/ /* Deletes all trail frames that are no longer conditional. */ Index: init_xsb.c =================================================================== RCS file: /cvsroot/xsb/XSB/emu/init_xsb.c,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- init_xsb.c 24 Jan 2006 14:10:01 -0000 1.82 +++ init_xsb.c 27 Jan 2006 20:29:46 -0000 1.83 @@ -128,7 +128,7 @@ Cell answer_return_inst; Cell resume_compl_suspension_inst; -// Cell resume_compl_suspension_inst2; +Cell resume_compl_suspension_inst2; Cell check_complete_inst; Cell hash_handle_inst; Cell fail_inst; @@ -932,7 +932,7 @@ cell_opcode(&answer_return_inst) = answer_return; cell_opcode(&resume_compl_suspension_inst) = resume_compl_suspension; - // cell_opcode(&resume_compl_suspension_inst2) = resume_compl_suspension; + cell_opcode(&resume_compl_suspension_inst2) = resume_compl_suspension; cell_opcode(&check_complete_inst) = check_complete; cell_opcode(&hash_handle_inst) = hash_handle; cell_opcode(&fail_inst) = fail; Index: memory_xsb.h =================================================================== RCS file: /cvsroot/xsb/XSB/emu/memory_xsb.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- memory_xsb.h 31 Dec 2005 23:16:03 -0000 1.27 +++ memory_xsb.h 27 Jan 2006 20:29:47 -0000 1.28 @@ -170,7 +170,7 @@ extern Cell answer_return_inst, check_complete_inst, hash_handle_inst, resume_compl_suspension_inst, fail_inst, dynfail_inst, halt_inst, proceed_inst, -// resume_compl_suspension_inst2, + resume_compl_suspension_inst2, reset_inst, trie_fail_unlock_inst; Index: thread_xsb.c =================================================================== RCS file: /cvsroot/xsb/XSB/emu/thread_xsb.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- thread_xsb.c 16 Jan 2006 00:33:23 -0000 1.35 +++ thread_xsb.c 27 Jan 2006 20:29:47 -0000 1.36 @@ -75,8 +75,6 @@ extern void thread_free_tab_blks(CTXTdecl); extern void delete_predicate_table(CTXTdeclc TIFptr); -// pthread_mutex_t sys_mut[MAX_SYS_MUTEXES] ; - MutexFrame sys_mut[MAX_SYS_MUTEXES] ; pthread_mutex_t th_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -98,7 +96,7 @@ "mutex_flags"," mutex_load_undef","mutex_delay","mutex_sys_system","unused", "unused","unused","unused","unused","unused", "mutex_string","mutex_atom_buf","mutex_sm","mutex_stacks","mutex_sockets", -"mutex_mem","mutex_odbc","mutex_gentag","unused","unused", +"mutex_mem","mutex_odbc","mutex_gentag","mutex_dispbkhdr","unused", "unused","unused","unused","unused","unused", "mutex_console","mutex_user1","mutex_user2","mutex_user3","mutex_user4", "mutex_user5","mutex_user6","mutex_user7","mutex_user9","mutex_user9"}; Index: thread_xsb.h =================================================================== RCS file: /cvsroot/xsb/XSB/emu/thread_xsb.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- thread_xsb.h 22 Dec 2005 23:34:00 -0000 1.14 +++ thread_xsb.h 27 Jan 2006 20:29:47 -0000 1.15 @@ -105,10 +105,10 @@ th_context *find_context( int tid ); #endif -#define ENSURE_ONE_THREAD() \ -{ if( flags[NUM_THREADS] > 1 ) \ - xsb_abort( "more than one thread running" ) ; \ -} +#define ENSURE_ONE_THREAD() \ + { if( flags[NUM_THREADS] > 1 ) \ + xsb_abort( "Operation is permitted only when a single thread is active" ) ; \ + } /* |