summary refs log tree commit diff stats
path: root/include/exec
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-03-28 17:55:24 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-06-05 16:10:33 +0200
commit0f590e749f7c838bfd40b79242fc5aeb91e81747 (patch)
treedc7978fe575a9886b3425e396c7c36e4a035254b /include/exec
parentd94f0a8ecb256fcfcd9eb12bd4700711eca3e937 (diff)
downloadfocaccia-qemu-0f590e749f7c838bfd40b79242fc5aeb91e81747.tar.gz
focaccia-qemu-0f590e749f7c838bfd40b79242fc5aeb91e81747.zip
softmmu: commonize helper definitions
They do not need to be in op_helper.c.  Because cputlb.c now includes
softmmu_template.h twice for each size, io_readX must be elided the
second time through.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/exec')
-rw-r--r--include/exec/softmmu_template.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/exec/softmmu_template.h b/include/exec/softmmu_template.h
index 12ead5a2b1..5a07f991a1 100644
--- a/include/exec/softmmu_template.h
+++ b/include/exec/softmmu_template.h
@@ -116,6 +116,7 @@
 # define helper_te_st_name  helper_le_st_name
 #endif
 
+#ifndef SOFTMMU_CODE_ACCESS
 static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env,
                                               hwaddr physaddr,
                                               target_ulong addr,
@@ -135,6 +136,7 @@ static inline DATA_TYPE glue(io_read, SUFFIX)(CPUArchState *env,
     io_mem_read(mr, physaddr, &val, 1 << SHIFT);
     return val;
 }
+#endif
 
 #ifdef SOFTMMU_CODE_ACCESS
 static __attribute__((unused))