Merge branch 'master' of ssh://git.dcc.fc.up.pt/yap-6.3
This commit is contained in:
commit
9fff6e7226
@ -333,11 +333,11 @@ p_first_signal( USES_REGS1 )
|
|||||||
if (mask == 0)
|
if (mask == 0)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
#if HAVE___BUILTIN_FFSLL
|
#if HAVE___BUILTIN_FFSLL
|
||||||
x sig = __builtin_ffsll(mask);
|
sig = __builtin_ffsll(mask);
|
||||||
#elif HAVE_FFSLL
|
#elif HAVE_FFSLL
|
||||||
sig = ffsll(mask);
|
sig = ffsll(mask);
|
||||||
#else
|
#else
|
||||||
sig = Yap_msb( mask );
|
sig = Yap_msb( mask )+1;
|
||||||
#endif
|
#endif
|
||||||
if (get_signal(sig PASS_REGS)) {
|
if (get_signal(sig PASS_REGS)) {
|
||||||
break;
|
break;
|
||||||
|
@ -573,13 +573,13 @@ if (CMAKE_COMPILER_IS_GNUCC)
|
|||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes")
|
||||||
message(STATUS "Running with CMAKE_C_FLAGS ${CMAKE_C_FLAGS}")
|
message(STATUS "Running with CMAKE_C_FLAGS ${CMAKE_C_FLAGS}")
|
||||||
message(STATUS "Original CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
|
message(STATUS "Original CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O -g ")
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g ")
|
||||||
message(STATUS "Runing with CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
|
message(STATUS "Runing with CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}")
|
||||||
message(STATUS "Original CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}")
|
message(STATUS "Original CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}")
|
||||||
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer")
|
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -fstrict-aliasing -freorder-blocks -fsched-interblock")
|
||||||
message(STATUS "Running with CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}")
|
message(STATUS "Running with CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}")
|
||||||
endif()
|
endif()
|
||||||
add_definitions(-O -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall)
|
add_definitions( -Wall)
|
||||||
add_definitions(-D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H -DLOW_LEVEL_TRACER=1 -DDEBUG=1)
|
add_definitions(-D_YAP_NOT_INSTALLED_=1 -DHAVE_CONFIG_H -DLOW_LEVEL_TRACER=1 -DDEBUG=1)
|
||||||
add_definitions(-DTHREADEAD_CODE=1)
|
add_definitions(-DTHREADEAD_CODE=1)
|
||||||
add_definitions(-D_GNU_SOURCE=1 -D_XOPEN_SOURCE=700)
|
add_definitions(-D_GNU_SOURCE=1 -D_XOPEN_SOURCE=700)
|
||||||
|
@ -428,7 +428,6 @@ void Yap_InitUtilCPreds(void);
|
|||||||
Int Yap_TermHash(Term, Int, Int, int);
|
Int Yap_TermHash(Term, Int, Int, int);
|
||||||
Int Yap_NumberVars(Term, Int, int);
|
Int Yap_NumberVars(Term, Int, int);
|
||||||
Term Yap_TermVariables( Term t, UInt arity USES_REGS );
|
Term Yap_TermVariables( Term t, UInt arity USES_REGS );
|
||||||
int Yap_IsListOrPartialListTerm( UInt arity USES_REGS );
|
|
||||||
Term Yap_UnNumberTerm(Term, int);
|
Term Yap_UnNumberTerm(Term, int);
|
||||||
Int Yap_SkipList(Term *, Term **);
|
Int Yap_SkipList(Term *, Term **);
|
||||||
/* yap.c */
|
/* yap.c */
|
||||||
|
Reference in New Issue
Block a user