commit f28d0dfdce5754d80d2a5993fff2f5312b32cac1
author Emilio G. Cota <cota@braap.org> Fri Jun 22 13:45:31 2018 -0400
committer Peter Maydell <peter.maydell@linaro.org> Fri Jun 22 18:55:24 2018 +0100
tree a617a0509e7b4eac361345a3f1d0a1a33fcc0dfb
parent 7ed14cbf3cf083f125c079bd02b3215941853830

tcg: fix --disable-tcg build breakage

Fix the --disable-tcg breakage introduced by tb_lock's removal by
relying on the fact that tcg_enabled() is set to 0 at
compile-time under --disable-tcg.

While at it, add further asserts to fix builds that enable both
--disable-tcg and --enable-debug, which were broken even before
tb_lock's removal.

Tested to build x86_64-softmmu and i386-softmmu targets.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

exec.c

diff --git a/exec.c b/exec.c
index 28f9bdc..88edb59 100644
--- a/exec.c
+++ b/exec.c
@@ -1323,6 +1323,7 @@
     RAMBlock *block;
     ram_addr_t end;
 
+    assert(tcg_enabled());
     end = TARGET_PAGE_ALIGN(start + length);
     start &= TARGET_PAGE_MASK;
 
@@ -2655,6 +2656,7 @@
 void memory_notdirty_write_complete(NotDirtyInfo *ndi)
 {
     if (ndi->pages) {
+        assert(tcg_enabled());
         page_collection_unlock(ndi->pages);
         ndi->pages = NULL;
     }
@@ -3046,6 +3048,7 @@
     CPUAddressSpace *cpuas;
     AddressSpaceDispatch *d;
 
+    assert(tcg_enabled());
     /* since each CPU stores ram addresses in its TLB cache, we must
        reset the modified entries */
     cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener);