[Guile-commits] GNU Guile branch, master, updated. v2.1.0-423-g473d563

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=473d56373341b0224aa43c3149564ae7f2e20471

The branch, master has been updated
       via  473d56373341b0224aa43c3149564ae7f2e20471 (commit)
       via  6ed55e9143e4b9db4d9de744f9ab6104754e1a9d (commit)
       via  62e16606950f2e9aae6410e90ab3bfff882a3767 (commit)
      from  ea0cd17d11fb73f79842c03b49df5c7aef4b36eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 473d56373341b0224aa43c3149564ae7f2e20471
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 20 20:01:30 2013 +0100

    Fix standalone tests
    
    * test-suite/vm/run-vm-tests.scm: Fix for objcode -> loader rename.

commit 6ed55e9143e4b9db4d9de744f9ab6104754e1a9d
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 20 19:38:37 2013 +0100

    vm-engine cosmetic cleanup
    
    * libguile/vm-engine.c: Reindent UNPACK macros.

commit 62e16606950f2e9aae6410e90ab3bfff882a3767
Author: Andy Wingo <address@hidden>
Date:   Wed Nov 20 19:38:06 2013 +0100

    Remove unused resolve_variable helper
    
    * libguile/vm.c (resolve_variable): Remove unused helper.

-----------------------------------------------------------------------

Summary of changes:
 libguile/vm-engine.c           |   24 ++++++++++++------------
 libguile/vm.c                  |   35 -----------------------------------
 test-suite/vm/run-vm-tests.scm |    2 +-
 3 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 065b7fe..20a5ee0 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -19,7 +19,7 @@
 /* This file is included in vm.c multiple times.  */
 
 
-#define UNPACK_8_8_8(op,a,b,c)    \
+#define UNPACK_8_8_8(op,a,b,c)            \
   do                                      \
     {                                     \
       a = (op >> 8) & 0xff;               \
@@ -28,7 +28,7 @@
     }                                     \
   while (0)
 
-#define UNPACK_8_16(op,a,b)       \
+#define UNPACK_8_16(op,a,b)               \
   do                                      \
     {                                     \
       a = (op >> 8) & 0xff;               \
@@ -36,7 +36,7 @@
     }                                     \
   while (0)
 
-#define UNPACK_16_8(op,a,b)       \
+#define UNPACK_16_8(op,a,b)               \
   do                                      \
     {                                     \
       a = (op >> 8) & 0xffff;             \
@@ -44,7 +44,7 @@
     }                                     \
   while (0)
 
-#define UNPACK_12_12(op,a,b)      \
+#define UNPACK_12_12(op,a,b)              \
   do                                      \
     {                                     \
       a = (op >> 8) & 0xfff;              \
@@ -52,7 +52,7 @@
     }                                     \
   while (0)
 
-#define UNPACK_24(op,a)           \
+#define UNPACK_24(op,a)                   \
   do                                      \
     {                                     \
       a = op >> 8;                        \
@@ -84,13 +84,13 @@
 # define JT_REG
 #endif
 
-#define VM_ASSERT(condition, handler)           \
-  do {                                          \
-    if (SCM_UNLIKELY (!(condition)))            \
-      {                                         \
-        SYNC_ALL();                             \
-        handler;                                \
-      }                                         \
+#define VM_ASSERT(condition, handler)     \
+  do {                                    \
+    if (SCM_UNLIKELY (!(condition)))      \
+      {                                   \
+        SYNC_ALL();                       \
+        handler;                          \
+      }                                   \
   } while (0)
 
 #ifdef VM_ENABLE_ASSERTIONS
diff --git a/libguile/vm.c b/libguile/vm.c
index 125501e..b1b5941 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -715,41 +715,6 @@ scm_i_call_with_current_continuation (SCM proc)
  * VM
  */
 
-static SCM
-resolve_variable (SCM what, SCM module)
-{
-  if (SCM_LIKELY (scm_is_symbol (what)))
-    {
-      if (scm_is_true (module))
-        return scm_module_lookup (module, what);
-      else
-        return scm_module_lookup (scm_the_root_module (), what);
-    }
-  else
-    {
-      SCM modname, sym, public;
-
-      modname = SCM_CAR (what);
-      sym = SCM_CADR (what);
-      public = SCM_CADDR (what);
-
-      if (!scm_module_system_booted_p)
-        {
-#ifdef VM_ENABLE_PARANOID_ASSERTIONS
-          ASSERT (scm_is_false (public));
-          ASSERT (scm_is_true
-                  (scm_equal_p (modname,
-                                scm_list_1 (scm_from_utf8_symbol ("guile")))));
-#endif
-          return scm_lookup (sym);
-        }
-      else if (scm_is_true (public))
-        return scm_public_lookup (modname, sym);
-      else
-        return scm_private_lookup (modname, sym);
-    }
-}
-  
 #define VM_MIN_STACK_SIZE      (1024)
 #define VM_DEFAULT_STACK_SIZE  (256 * 1024)
 static size_t vm_stack_size = VM_DEFAULT_STACK_SIZE;
diff --git a/test-suite/vm/run-vm-tests.scm b/test-suite/vm/run-vm-tests.scm
index 31518df..2254363 100644
--- a/test-suite/vm/run-vm-tests.scm
+++ b/test-suite/vm/run-vm-tests.scm
@@ -18,7 +18,7 @@
 
 
 (use-modules (system vm vm)
-             (system vm objcode)
+             (system vm loader)
             (system vm program)
             (system base compile)
             (system base language)


hooks/post-receive
-- 
GNU Guile