From 771610ffb625a433692cdb268cf07eb1a887a24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sun, 18 Jan 2015 03:47:44 +0000 Subject: [PATCH 1/3] fix bit count --- C/signals.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/C/signals.c b/C/signals.c index 379df3f60..73d220592 100755 --- a/C/signals.c +++ b/C/signals.c @@ -333,16 +333,16 @@ p_first_signal( USES_REGS1 ) if (mask == 0) return FALSE; #if HAVE___BUILTIN_FFSLL -x sig = __builtin_ffsll(mask); + sig = __builtin_ffsll(mask); #elif HAVE_FFSLL sig = ffsll(mask); #else - sig = Yap_msb( mask ); + sig = Yap_msb( mask )+1; #endif if (get_signal(sig PASS_REGS)) { break; } - } + } loop: switch (sig) { case YAP_INT_SIGNAL: From 8f1699a343908cdb57a9f7c08447a6b664c42855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sun, 18 Jan 2015 03:48:02 +0000 Subject: [PATCH 2/3] fix bad protos --- H/Yapproto.h | 1 - 1 file changed, 1 deletion(-) diff --git a/H/Yapproto.h b/H/Yapproto.h index 66d327dcf..b5e61e35a 100755 --- a/H/Yapproto.h +++ b/H/Yapproto.h @@ -428,7 +428,6 @@ void Yap_InitUtilCPreds(void); Int Yap_TermHash(Term, Int, Int, int); Int Yap_NumberVars(Term, Int, int); Term Yap_TermVariables( Term t, UInt arity USES_REGS ); -int Yap_IsListOrPartialListTerm( UInt arity USES_REGS ); Term Yap_UnNumberTerm(Term, int); Int Yap_SkipList(Term *, Term **); /* yap.c */ From 24a36002cc39d65b8633a4ec14162d090387c767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Sun, 18 Jan 2015 03:48:26 +0000 Subject: [PATCH 3/3] fix cmake debug --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 29bdb68ea..d97e9549d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -573,13 +573,13 @@ if (CMAKE_COMPILER_IS_GNUCC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wstrict-prototypes -Wmissing-prototypes") message(STATUS "Running with CMAKE_C_FLAGS ${CMAKE_C_FLAGS}") 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 "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}") 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(-DTHREADEAD_CODE=1) add_definitions(-D_GNU_SOURCE=1 -D_XOPEN_SOURCE=700)