gwj / at91sam9263 · Commits

Commit 4f716dc681d1bfa78d0863499fc1f2e13f170ede

Authored by bellard
1 parent 539827ec

avoid redefinition problems 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1331 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 41 additions and 3 deletions
translate-all.c
  View file @4f716dc
... ... @@ -30,6 +30,10 @@
30 30 #include "exec-all.h"
31 31 #include "disas.h"
32 32  
  33 +extern int dyngen_code(uint8_t *gen_code_buf,
  34 + uint16_t *label_offsets, uint16_t *jmp_offsets,
  35 + const uint16_t *opc_buf, const uint32_t *opparam_buf, const long *gen_labels);
  36 +
33 37 enum {
34 38 #define DEF(s, n, copy_size) INDEX_op_ ## s,
35 39 #include "opc.h"
... ... @@ -37,9 +41,6 @@ enum {
37 41 NB_OPS,
38 42 };
39 43  
40   -#include "dyngen.h"
41   -#include "op.h"
42   -
43 44 uint16_t gen_opc_buf[OPC_BUF_SIZE];
44 45 uint32_t gen_opparam_buf[OPPARAM_BUF_SIZE];
45 46 long gen_labels[OPC_BUF_SIZE];
... ...
translate-op.c 0 → 100644
  View file @4f716dc
  1 +/*
  2 + * Host code generation
  3 + *
  4 + * Copyright (c) 2003 Fabrice Bellard
  5 + *
  6 + * This library is free software; you can redistribute it and/or
  7 + * modify it under the terms of the GNU Lesser General Public
  8 + * License as published by the Free Software Foundation; either
  9 + * version 2 of the License, or (at your option) any later version.
  10 + *
  11 + * This library is distributed in the hope that it will be useful,
  12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  14 + * Lesser General Public License for more details.
  15 + *
  16 + * You should have received a copy of the GNU Lesser General Public
  17 + * License along with this library; if not, write to the Free Software
  18 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  19 + */
  20 +#include <stdarg.h>
  21 +#include <stdlib.h>
  22 +#include <stdio.h>
  23 +#include <string.h>
  24 +#include <inttypes.h>
  25 +
  26 +#include "config.h"
  27 +
  28 +enum {
  29 +#define DEF(s, n, copy_size) INDEX_op_ ## s,
  30 +#include "opc.h"
  31 +#undef DEF
  32 + NB_OPS,
  33 +};
  34 +
  35 +#include "dyngen.h"
  36 +#include "op.h"
  37 +
... ...