Patchwork Make tb_alloc static.

login
register
mail settings
Submitter Tristan Gingold
Date Feb. 8, 2011, 11:22 a.m.
Message ID <1297164135-30510-1-git-send-email-gingold@adacore.com>
Download mbox | patch
Permalink /patch/82303/
State New
Headers show

Comments

Tristan Gingold - Feb. 8, 2011, 11:22 a.m.
This function is only used within exec.c, so no need to make it public.

Signed-off-by: Tristan Gingold <gingold@adacore.com>
---
 exec-all.h |    1 -
 exec.c     |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)
Aurelien Jarno - Feb. 9, 2011, 6:52 p.m.
On Tue, Feb 08, 2011 at 12:22:15PM +0100, Tristan Gingold wrote:
> This function is only used within exec.c, so no need to make it public.
> 
> Signed-off-by: Tristan Gingold <gingold@adacore.com>
> ---
>  exec-all.h |    1 -
>  exec.c     |    4 +++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/exec-all.h b/exec-all.h
> index 81497c0..c062693 100644
> --- a/exec-all.h
> +++ b/exec-all.h
> @@ -182,7 +182,6 @@ static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc)
>      return (pc >> 2) & (CODE_GEN_PHYS_HASH_SIZE - 1);
>  }
>  
> -TranslationBlock *tb_alloc(target_ulong pc);
>  void tb_free(TranslationBlock *tb);
>  void tb_flush(CPUState *env);
>  void tb_link_page(TranslationBlock *tb,
> diff --git a/exec.c b/exec.c
> index 477199b..1c59d0b 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -221,6 +221,8 @@ static int tlb_flush_count;
>  static int tb_flush_count;
>  static int tb_phys_invalidate_count;
>  
> +static TranslationBlock *tb_alloc(target_ulong pc);
> +

What about moving tb_alloc() (with tb_free()) higher in the file? After
all it make sense to have the function creating or destructing a tb
before the function manipulating them.

Otherwise looks like a good idea.

>  #ifdef _WIN32
>  static void map_exec(void *addr, long size)
>  {
> @@ -1229,7 +1231,7 @@ static inline void tb_alloc_page(TranslationBlock *tb,
>  
>  /* Allocate a new translation block. Flush the translation buffer if
>     too many translation blocks or too much generated code. */
> -TranslationBlock *tb_alloc(target_ulong pc)
> +static TranslationBlock *tb_alloc(target_ulong pc)
>  {
>      TranslationBlock *tb;
>  
> -- 
> 1.7.3.GIT
> 
> 
>

Patch

diff --git a/exec-all.h b/exec-all.h
index 81497c0..c062693 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -182,7 +182,6 @@  static inline unsigned int tb_phys_hash_func(tb_page_addr_t pc)
     return (pc >> 2) & (CODE_GEN_PHYS_HASH_SIZE - 1);
 }
 
-TranslationBlock *tb_alloc(target_ulong pc);
 void tb_free(TranslationBlock *tb);
 void tb_flush(CPUState *env);
 void tb_link_page(TranslationBlock *tb,
diff --git a/exec.c b/exec.c
index 477199b..1c59d0b 100644
--- a/exec.c
+++ b/exec.c
@@ -221,6 +221,8 @@  static int tlb_flush_count;
 static int tb_flush_count;
 static int tb_phys_invalidate_count;
 
+static TranslationBlock *tb_alloc(target_ulong pc);
+
 #ifdef _WIN32
 static void map_exec(void *addr, long size)
 {
@@ -1229,7 +1231,7 @@  static inline void tb_alloc_page(TranslationBlock *tb,
 
 /* Allocate a new translation block. Flush the translation buffer if
    too many translation blocks or too much generated code. */
-TranslationBlock *tb_alloc(target_ulong pc)
+static TranslationBlock *tb_alloc(target_ulong pc)
 {
     TranslationBlock *tb;