sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

tcg: get rid of copy_size in TCGOpDef 

copy_size is a left-over from the dyngen era, remove it.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2010-06-03 19:29:31 +02:00
parent 590bf491a4
commit 239fda311a
6 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exec-all.h
View File

@ -80,7 +80,6 @@ void gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
void gen_pc_load(CPUState *env, struct TranslationBlock *tb, void gen_pc_load(CPUState *env, struct TranslationBlock *tb,
unsigned long searched_pc, int pc_pos, void *puc); unsigned long searched_pc, int pc_pos, void *puc);
unsigned long code_gen_max_block_size(void);
void cpu_gen_init(void); void cpu_gen_init(void);
int cpu_gen_code(CPUState *env, struct TranslationBlock *tb, int cpu_gen_code(CPUState *env, struct TranslationBlock *tb,
int *gen_code_size_ptr); int *gen_code_size_ptr);

2
exec.c
View File

@ -557,7 +557,7 @@ static void code_gen_alloc(unsigned long tb_size)
#endif /* !USE_STATIC_CODE_GEN_BUFFER */ #endif /* !USE_STATIC_CODE_GEN_BUFFER */
map_exec(code_gen_prologue, sizeof(code_gen_prologue)); map_exec(code_gen_prologue, sizeof(code_gen_prologue));
code_gen_buffer_max_size = code_gen_buffer_size - code_gen_buffer_max_size = code_gen_buffer_size -
code_gen_max_block_size(); (TCG_MAX_OP_SIZE * OPC_MAX_SIZE);
code_gen_max_blocks = code_gen_buffer_size / CODE_GEN_AVG_BLOCK_SIZE; code_gen_max_blocks = code_gen_buffer_size / CODE_GEN_AVG_BLOCK_SIZE;
tbs = qemu_malloc(code_gen_max_blocks * sizeof(TranslationBlock)); tbs = qemu_malloc(code_gen_max_blocks * sizeof(TranslationBlock));
} }

2
tcg/tcg-opc.h
View File

@ -22,7 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef DEF2 #ifndef DEF2
#define DEF2(name, oargs, iargs, cargs, flags) DEF(name, oargs + iargs + cargs, 0) #define DEF2(name, oargs, iargs, cargs, flags) DEF(name, oargs + iargs + cargs)
#endif #endif
/* predefined ops */ /* predefined ops */

2
tcg/tcg.c
View File

@ -69,7 +69,7 @@ static void patch_reloc(uint8_t *code_ptr, int type,
tcg_target_long value, tcg_target_long addend); tcg_target_long value, tcg_target_long addend);
static TCGOpDef tcg_op_defs[] = { static TCGOpDef tcg_op_defs[] = {
#define DEF(s, n, copy_size) { #s, 0, 0, n, n, 0, copy_size }, #define DEF(s, n) { #s, 0, 0, n, n, 0 },
#define DEF2(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags, 0 }, #define DEF2(s, oargs, iargs, cargs, flags) { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags, 0 },
#include "tcg-opc.h" #include "tcg-opc.h"
#undef DEF #undef DEF

3
tcg/tcg.h
View File

@ -48,7 +48,7 @@ typedef uint64_t TCGRegSet;
#endif #endif
typedef enum TCGOpcode { typedef enum TCGOpcode {
#define DEF(s, n, copy_size) INDEX_op_ ## s, #define DEF(s, n) INDEX_op_ ## s,
#include "tcg-opc.h" #include "tcg-opc.h"
#undef DEF #undef DEF
NB_OPS, NB_OPS,
@ -422,7 +422,6 @@ typedef struct TCGOpDef {
const char *name; const char *name;
uint8_t nb_oargs, nb_iargs, nb_cargs, nb_args; uint8_t nb_oargs, nb_iargs, nb_cargs, nb_args;
uint8_t flags; uint8_t flags;
uint16_t copy_size;
TCGArgConstraint *args_ct; TCGArgConstraint *args_ct;
int *sorted_args; int *sorted_args;
#if defined(CONFIG_DEBUG_TCG) #if defined(CONFIG_DEBUG_TCG)

16
translate-all.c
View File

@ -41,22 +41,6 @@ target_ulong gen_opc_pc[OPC_BUF_SIZE];
uint16_t gen_opc_icount[OPC_BUF_SIZE]; uint16_t gen_opc_icount[OPC_BUF_SIZE];
uint8_t gen_opc_instr_start[OPC_BUF_SIZE]; uint8_t gen_opc_instr_start[OPC_BUF_SIZE];
/* XXX: suppress that */
unsigned long code_gen_max_block_size(void)
{
static unsigned long max;
if (max == 0) {
max = TCG_MAX_OP_SIZE;
#define DEF(s, n, copy_size) max = copy_size > max? copy_size : max;
#include "tcg-opc.h"
#undef DEF
max *= OPC_MAX_SIZE;
}
return max;
}
void cpu_gen_init(void) void cpu_gen_init(void)
{ {
tcg_context_init(&tcg_ctx); tcg_context_init(&tcg_ctx);