 db647703ba
			
		
	
	
		db647703ba
		
	
	
	
	
		
			
			When TCG is enabled, the accel/tcg/ include path is added to the project global include search list. This accel/tcg/ directory contains a header named "internal.h" which, while intented to be internal to accel/tcg/, is accessible by all files compiled when TCG is enabled. This might lead to problem with other directories using the same "internal.h" header name: $ git ls-files | fgrep /internal.h accel/tcg/internal.h include/hw/ide/internal.h target/hexagon/internal.h target/mips/internal.h target/ppc/internal.h target/s390x/internal.h As we don't need to expose accel/tcg/ internals to the rest of the code base, simplify by removing it from the include search list, and include the accel/tcg/ public headers relative to the project root search path (which is already in the generic include search path). Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Claudio Fontana <cfontana@suse.de> Message-Id: <20210413081008.3409459-1-f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
		
			
				
	
	
		
			77 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* Helper file for declaring TCG helper functions.
 | |
|    This one defines data structures private to tcg.c.  */
 | |
| 
 | |
| #ifndef HELPER_TCG_H
 | |
| #define HELPER_TCG_H
 | |
| 
 | |
| #include "exec/helper-head.h"
 | |
| 
 | |
| /* Need one more level of indirection before stringification
 | |
|    to get all the macros expanded first.  */
 | |
| #define str(s) #s
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_0(NAME, FLAGS, ret) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_1(NAME, FLAGS, ret, t1) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_2(NAME, FLAGS, ret, t1, t2) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_3(NAME, FLAGS, ret, t1, t2, t3) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_4(NAME, FLAGS, ret, t1, t2, t3, t4) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_5(NAME, FLAGS, ret, t1, t2, t3, t4, t5) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \
 | |
|     | dh_sizemask(t5, 5) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_6(NAME, FLAGS, ret, t1, t2, t3, t4, t5, t6) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), \
 | |
|     .flags = FLAGS | dh_callflag(ret), \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \
 | |
|     | dh_sizemask(t5, 5) | dh_sizemask(t6, 6) },
 | |
| 
 | |
| #define DEF_HELPER_FLAGS_7(NAME, FLAGS, ret, t1, t2, t3, t4, t5, t6, t7) \
 | |
|   { .func = HELPER(NAME), .name = str(NAME), .flags = FLAGS, \
 | |
|     .sizemask = dh_sizemask(ret, 0) | dh_sizemask(t1, 1) \
 | |
|     | dh_sizemask(t2, 2) | dh_sizemask(t3, 3) | dh_sizemask(t4, 4) \
 | |
|     | dh_sizemask(t5, 5) | dh_sizemask(t6, 6) | dh_sizemask(t7, 7) },
 | |
| 
 | |
| #include "helper.h"
 | |
| #include "trace/generated-helpers.h"
 | |
| #include "accel/tcg/tcg-runtime.h"
 | |
| #include "accel/tcg/plugin-helpers.h"
 | |
| 
 | |
| #undef str
 | |
| #undef DEF_HELPER_FLAGS_0
 | |
| #undef DEF_HELPER_FLAGS_1
 | |
| #undef DEF_HELPER_FLAGS_2
 | |
| #undef DEF_HELPER_FLAGS_3
 | |
| #undef DEF_HELPER_FLAGS_4
 | |
| #undef DEF_HELPER_FLAGS_5
 | |
| #undef DEF_HELPER_FLAGS_6
 | |
| #undef DEF_HELPER_FLAGS_7
 | |
| 
 | |
| #endif /* HELPER_TCG_H */
 |