qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [4891] Small cleanup of gen_intermediate_code(_internal), b


From: Thiemo Seufer
Subject: [Qemu-devel] [4891] Small cleanup of gen_intermediate_code(_internal), by Laurent Desnogues.
Date: Fri, 18 Jul 2008 18:01:29 +0000

Revision: 4891
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4891
Author:   ths
Date:     2008-07-18 18:01:29 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Small cleanup of gen_intermediate_code(_internal), by Laurent Desnogues.

Modified Paths:
--------------
    trunk/exec-all.h
    trunk/target-alpha/translate.c
    trunk/target-arm/translate.c
    trunk/target-cris/translate.c
    trunk/target-i386/translate.c
    trunk/target-m68k/translate.c
    trunk/target-mips/translate.c
    trunk/target-ppc/translate.c
    trunk/target-sh4/translate.c
    trunk/target-sparc/translate.c
    trunk/translate-all.c

Modified: trunk/exec-all.h
===================================================================
--- trunk/exec-all.h    2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/exec-all.h    2008-07-18 18:01:29 UTC (rev 4891)
@@ -60,8 +60,8 @@
 extern FILE *logfile;
 extern int loglevel;
 
-int gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
-int gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
+void gen_intermediate_code(CPUState *env, struct TranslationBlock *tb);
+void gen_intermediate_code_pc(CPUState *env, struct TranslationBlock *tb);
 void gen_pc_load(CPUState *env, struct TranslationBlock *tb,
                  unsigned long searched_pc, int pc_pos, void *puc);
 

Modified: trunk/target-alpha/translate.c
===================================================================
--- trunk/target-alpha/translate.c      2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-alpha/translate.c      2008-07-18 18:01:29 UTC (rev 4891)
@@ -1970,9 +1970,9 @@
     return ret;
 }
 
-static always_inline int gen_intermediate_code_internal (CPUState *env,
-                                                         TranslationBlock *tb,
-                                                         int search_pc)
+static always_inline void gen_intermediate_code_internal (CPUState *env,
+                                                          TranslationBlock *tb,
+                                                          int search_pc)
 {
 #if defined ALPHA_DEBUG_DISAS
     static int insn_count;
@@ -2086,18 +2086,16 @@
         fprintf(logfile, "\n");
     }
 #endif
-
-    return 0;
 }
 
-int gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 CPUAlphaState * cpu_alpha_init (const char *cpu_model)

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c        2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-arm/translate.c        2008-07-18 18:01:29 UTC (rev 4891)
@@ -8544,9 +8544,9 @@
 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
    basic block 'tb'. If search_pc is TRUE, also generate PC
    information for each intermediate instruction. */
-static inline int gen_intermediate_code_internal(CPUState *env,
-                                                 TranslationBlock *tb,
-                                                 int search_pc)
+static inline void gen_intermediate_code_internal(CPUState *env,
+                                                  TranslationBlock *tb,
+                                                  int search_pc)
 {
     DisasContext dc1, *dc = &dc1;
     uint16_t *gen_opc_end;
@@ -8787,17 +8787,16 @@
         tb->size = dc->pc - pc_start;
         tb->icount = num_insns;
     }
-    return 0;
 }
 
-int gen_intermediate_code(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 static const char *cpu_mode_names[16] = {

Modified: trunk/target-cris/translate.c
===================================================================
--- trunk/target-cris/translate.c       2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-cris/translate.c       2008-07-18 18:01:29 UTC (rev 4891)
@@ -3022,7 +3022,7 @@
  */
 
 /* generate intermediate code for basic block 'tb'.  */
-static int
+static void
 gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
                                int search_pc)
 {
@@ -3233,17 +3233,16 @@
                        dc->pc - pc_start, gen_opc_ptr - gen_opc_buf);
        }
 #endif
-       return 0;
 }
 
-int gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void cpu_dump_state (CPUState *env, FILE *f,

Modified: trunk/target-i386/translate.c
===================================================================
--- trunk/target-i386/translate.c       2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-i386/translate.c       2008-07-18 18:01:29 UTC (rev 4891)
@@ -7148,9 +7148,9 @@
 /* generate intermediate code in gen_opc_buf and gen_opparam_buf for
    basic block 'tb'. If search_pc is TRUE, also generate PC
    information for each intermediate instruction. */
-static inline int gen_intermediate_code_internal(CPUState *env,
-                                                 TranslationBlock *tb,
-                                                 int search_pc)
+static inline void gen_intermediate_code_internal(CPUState *env,
+                                                  TranslationBlock *tb,
+                                                  int search_pc)
 {
     DisasContext dc1, *dc = &dc1;
     target_ulong pc_ptr;
@@ -7321,17 +7321,16 @@
         tb->size = pc_ptr - pc_start;
         tb->icount = num_insns;
     }
-    return 0;
 }
 
-int gen_intermediate_code(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void gen_pc_load(CPUState *env, TranslationBlock *tb,

Modified: trunk/target-m68k/translate.c
===================================================================
--- trunk/target-m68k/translate.c       2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-m68k/translate.c       2008-07-18 18:01:29 UTC (rev 4891)
@@ -2911,7 +2911,7 @@
 }
 
 /* generate intermediate code for basic block 'tb'.  */
-static inline int
+static inline void
 gen_intermediate_code_internal(CPUState *env, TranslationBlock *tb,
                                int search_pc)
 {
@@ -3039,17 +3039,16 @@
 
     //optimize_flags();
     //expand_target_qops();
-    return 0;
 }
 
-int gen_intermediate_code(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
+void gen_intermediate_code_pc(CPUState *env, TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void cpu_dump_state(CPUState *env, FILE *f,

Modified: trunk/target-mips/translate.c
===================================================================
--- trunk/target-mips/translate.c       2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-mips/translate.c       2008-07-18 18:01:29 UTC (rev 4891)
@@ -8453,7 +8453,7 @@
     }
 }
 
-static inline int
+static inline void
 gen_intermediate_code_internal (CPUState *env, TranslationBlock *tb,
                                 int search_pc)
 {
@@ -8598,18 +8598,16 @@
         fprintf(logfile, "---------------- %d %08x\n", ctx.bstate, ctx.hflags);
     }
 #endif
-
-    return 0;
 }
 
-int gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void fpu_dump_state(CPUState *env, FILE *f,

Modified: trunk/target-ppc/translate.c
===================================================================
--- trunk/target-ppc/translate.c        2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-ppc/translate.c        2008-07-18 18:01:29 UTC (rev 4891)
@@ -6171,9 +6171,9 @@
 }
 
 /*****************************************************************************/
-static always_inline int gen_intermediate_code_internal (CPUState *env,
-                                                         TranslationBlock *tb,
-                                                         int search_pc)
+static always_inline void gen_intermediate_code_internal (CPUState *env,
+                                                          TranslationBlock *tb,
+                                                          int search_pc)
 {
     DisasContext ctx, *ctxp = &ctx;
     opc_handler_t **table, *handler;
@@ -6379,17 +6379,16 @@
         fprintf(logfile, "\n");
     }
 #endif
-    return 0;
 }
 
-int gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
+void gen_intermediate_code_pc (CPUState *env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void gen_pc_load(CPUState *env, TranslationBlock *tb,

Modified: trunk/target-sh4/translate.c
===================================================================
--- trunk/target-sh4/translate.c        2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-sh4/translate.c        2008-07-18 18:01:29 UTC (rev 4891)
@@ -1195,7 +1195,7 @@
     }
 }
 
-static inline int
+static inline void
 gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb,
                                int search_pc)
 {
@@ -1326,17 +1326,16 @@
        fprintf(logfile, "\n");
     }
 #endif
-    return 0;
 }
 
-int gen_intermediate_code(CPUState * env, struct TranslationBlock *tb)
+void gen_intermediate_code(CPUState * env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 0);
+    gen_intermediate_code_internal(env, tb, 0);
 }
 
-int gen_intermediate_code_pc(CPUState * env, struct TranslationBlock *tb)
+void gen_intermediate_code_pc(CPUState * env, struct TranslationBlock *tb)
 {
-    return gen_intermediate_code_internal(env, tb, 1);
+    gen_intermediate_code_internal(env, tb, 1);
 }
 
 void gen_pc_load(CPUState *env, TranslationBlock *tb,

Modified: trunk/target-sparc/translate.c
===================================================================
--- trunk/target-sparc/translate.c      2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/target-sparc/translate.c      2008-07-18 18:01:29 UTC (rev 4891)
@@ -4724,8 +4724,8 @@
 #endif
 }
 
-static inline int gen_intermediate_code_internal(TranslationBlock * tb,
-                                                 int spc, CPUSPARCState *env)
+static inline void gen_intermediate_code_internal(TranslationBlock * tb,
+                                                  int spc, CPUSPARCState *env)
 {
     target_ulong pc_start, last_pc;
     uint16_t *gen_opc_end;
@@ -4869,17 +4869,16 @@
         fprintf(logfile, "\n");
     }
 #endif
-    return 0;
 }
 
-int gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb)
+void gen_intermediate_code(CPUSPARCState * env, TranslationBlock * tb)
 {
-    return gen_intermediate_code_internal(tb, 0, env);
+    gen_intermediate_code_internal(tb, 0, env);
 }
 
-int gen_intermediate_code_pc(CPUSPARCState * env, TranslationBlock * tb)
+void gen_intermediate_code_pc(CPUSPARCState * env, TranslationBlock * tb)
 {
-    return gen_intermediate_code_internal(tb, 1, env);
+    gen_intermediate_code_internal(tb, 1, env);
 }
 
 void gen_intermediate_code_init(CPUSPARCState *env)

Modified: trunk/translate-all.c
===================================================================
--- trunk/translate-all.c       2008-07-18 16:49:42 UTC (rev 4890)
+++ trunk/translate-all.c       2008-07-18 18:01:29 UTC (rev 4891)
@@ -94,9 +94,8 @@
 #endif
     tcg_func_start(s);
 
-    if (gen_intermediate_code(env, tb) < 0)
-        return -1;
-    
+    gen_intermediate_code(env, tb);
+
     /* generate machine code */
     gen_code_buf = tb->tc_ptr;
     tb->tb_next_offset[0] = 0xffff;
@@ -156,8 +155,7 @@
 #endif
     tcg_func_start(s);
 
-    if (gen_intermediate_code_pc(env, tb) < 0)
-        return -1;
+    gen_intermediate_code_pc(env, tb);
 
     if (use_icount) {
         /* Reset the cycle counter to the start of the block.  */






reply via email to

[Prev in Thread] Current Thread [Next in Thread]