Put UCodeBlock get functions in a more sensible place -- moved from vg_needs.c

to vg_translate.c, where the other UCodeBlock functions live.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2557

diff --git a/coregrind/vg_needs.c b/coregrind/vg_needs.c
index cef8a15695f448edc512a6b23a395ae52ec802e6..9de43c7633fcde8485379f8228e7971684f77497 100644 (file)
--- a/coregrind/vg_needs.c
+++ b/coregrind/vg_needs.c
@@ -167,29 +167,6 @@ NEEDS(sanity_checks)
 NEEDS(data_syms)
 NEEDS(shadow_memory)
 
-/*--------------------------------------------------------------------*/
-/* UCodeBlocks */
-
-Int VG_(get_num_instrs) ( UCodeBlock* cb )
-{
-   return cb->used;
-}
-
-Int VG_(get_num_temps) ( UCodeBlock* cb )
-{
-   return cb->nextTemp;
-}
-
-UInstr* VG_(get_instr) ( UCodeBlock* cb, Int i )
-{
-   return & cb->instrs[i];
-}
-
-UInstr* VG_(get_last_instr) ( UCodeBlock* cb )
-{
-   return & cb->instrs[cb->used-1];
-}
-   
 /*--------------------------------------------------------------------*/
 /*--- end                                               vg_needs.c ---*/
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/vg_translate.c b/coregrind/vg_translate.c
index 6412a58ccf7716e320170710af8d849bcfca677b..716b426466cbeb288836a787400a92dd11b3fe70 100644 (file)
--- a/coregrind/vg_translate.c
+++ b/coregrind/vg_translate.c
@@ -339,6 +339,26 @@ Int VG_(realreg_to_rank) ( Int realReg )
    }
 }
 
+Int VG_(get_num_instrs) ( UCodeBlock* cb )
+{
+   return cb->used;
+}
+
+Int VG_(get_num_temps) ( UCodeBlock* cb )
+{
+   return cb->nextTemp;
+}
+
+UInstr* VG_(get_instr) ( UCodeBlock* cb, Int i )
+{
+   return & cb->instrs[i];
+}
+
+UInstr* VG_(get_last_instr) ( UCodeBlock* cb )
+{
+   return & cb->instrs[cb->used-1];
+}
+   
 
 /*------------------------------------------------------------*/
 /*--- Sanity checking uinstrs.                             ---*/