public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM]  archer-jankratochvil-entryval: test fix
@ 2011-07-08 12:15 jkratoch
  0 siblings, 0 replies; only message in thread
From: jkratoch @ 2011-07-08 12:15 UTC (permalink / raw)
  To: archer-commits

The branch, archer-jankratochvil-entryval has been updated
       via  51724a0811f5f9d17ca70322c2cb3bd374684786 (commit)
       via  7feb070db0addd5f2c0dd1b289c3ae032c626016 (commit)
       via  d38fa148621cc1679e8035b10bb3ee441ae6c3a7 (commit)
       via  04d14a06af5420d3737340399de89ee9a493517d (commit)
       via  a950b351ac34fd4eb1e737d33239f4719efbaa84 (commit)
       via  27d1cc7cca74da1ad194ffb8249b371e650f68a9 (commit)
       via  4ec36e2d3a3476304d1dac50ab6a3df0955aa9a8 (commit)
       via  5df3005e3951880b55ff154208b5b074a8b2220d (commit)
       via  bb1a59adb60fce6c90067718b4c7202abc730d7d (commit)
       via  5fcef10ce98a58a5ec153f73ab5510b57c3dc29c (commit)
       via  f6b77f5d4cc349d800440789e9fce8f476641e9f (commit)
       via  737a3f6ab3a6403013b8f4299847656d34378f90 (commit)
       via  303a8782e46605fa7978f5256b3b2a8695f407e5 (commit)
       via  eb084f33f1d9abd777cb0d6fe6e36c866c77c1f5 (commit)
       via  4580b7b5912496cf9a3ae48b8361848fde0720cf (commit)
      from  4d3e2f7c5bfa32c9c4ac1c576430affa7c7a9f95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 51724a0811f5f9d17ca70322c2cb3bd374684786
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Jul 8 14:14:36 2011 +0200

    test fix

commit 7feb070db0addd5f2c0dd1b289c3ae032c626016
Merge: 4d3e2f7 d38fa14
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Fri Jul 8 14:14:04 2011 +0200

    Merge remote-tracking branch 'gdb/master' into archer-jankratochvil-entryval

commit d38fa148621cc1679e8035b10bb3ee441ae6c3a7
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 08:37:26 2011 +0000

    	* ld-insn.c (print_insn_words): For fields, print conditionals.

commit 04d14a06af5420d3737340399de89ee9a493517d
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 06:26:14 2011 +0000

    Tweak heading of last entry

commit a950b351ac34fd4eb1e737d33239f4719efbaa84
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 06:24:11 2011 +0000

    	Correct handling of constant fields.
    	* gen.c (insn_field_cmp): Tweak comment about neither field
    	being an insn_field_string with a cond_eq-to-value condition.
    	(insns_bit_useless) <case insn_field_string, case
    	decode_find_mixed>: Handle cond_eq-to-value fields as
    	insn_field_int.
    	* gen-idecode.c (print_idecode_validate): Handle
    	insn_field_string cond-equal-to-value fields as insn_field_int.
    	* gen-icache.c (print_icache_body): Add comment why constant
    	string fields are handled.

commit 27d1cc7cca74da1ad194ffb8249b371e650f68a9
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 03:41:13 2011 +0000

    	* Makefile.in ($(SIM_MULTI_OBJ)): Depend on sim-main.h
    	$(SIM_EXTRA_DEPS).

commit 4ec36e2d3a3476304d1dac50ab6a3df0955aa9a8
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 03:18:56 2011 +0000

    	* Makefile.in (tmp-mach-multi): Exit early when igen fails.

commit 5df3005e3951880b55ff154208b5b074a8b2220d
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 02:27:18 2011 +0000

    	Remove all #if 0'd code.
    	* filter.c: Remove #if 0'd function it_is.
    	(main): Remove #if 0'd code.
    	* gen-engine.c: Remove #if 0'd functions print_jump,
    	print_jump_insn, print_jump_definition,
    	print_jump_internal_function, print_jump_body.
    	(gen_engine_c): Remove #if 0'd code.
    	* gen-idecode.c: Remove #if 0'd functions print_jump print_jump,
    	print_jump_insn, print_jump_definition,
    	print_jump_internal_function, print_jump_until_stop_body.
    	* gen-model.c: Remove #if 0'd functions model_c_or_h_data,
    	model_c_or_h_function, gen_model_h, model_c_insn,
    	model_c_function, gen_model_c and types model_c_passed_data
    	and struct _model_c_passed_data.
    	* gen.c: Remove #if 0'd type constant_field_types and function
    	insn_field_is_constant.
    	(gen_entry_find_opcode_field): Remove #if 0'd code.
    	* ld-insn.c (parse_insn_model_record): Remove #if 0'd code.
    	* misc.h (STRDUP, STRNDUP): Remove #if 0'd macros.

commit bb1a59adb60fce6c90067718b4c7202abc730d7d
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Fri Jul 8 01:43:09 2011 +0000

    	* MAINTAINERS: Remove Thiemo Seufer.

commit 5fcef10ce98a58a5ec153f73ab5510b57c3dc29c
Author: Alan Modra <amodra@bigpond.net.au>
Date:   Fri Jul 8 00:00:05 2011 +0000

    daily update

commit f6b77f5d4cc349d800440789e9fce8f476641e9f
Author: gdbadmin <gdbadmin@sourceware.org>
Date:   Fri Jul 8 00:00:03 2011 +0000

    *** empty log message ***

commit 737a3f6ab3a6403013b8f4299847656d34378f90
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Thu Jul 7 14:08:21 2011 +0000

    gdb/testsuite/
    	* gdb.java/jprint.exp (print a java.lang.String): xfail without system
    	debug info.

commit 303a8782e46605fa7978f5256b3b2a8695f407e5
Author: Hui Zhu <teawater@gmail.com>
Date:   Thu Jul 7 13:32:53 2011 +0000

    2011-07-07  Hui Zhu  <teawater@gmail.com>
    
    	Revert:
    	2011-07-06  Hui Zhu  <teawater@gmail.com>
    	* remote.c (remote_start_remote): Add TRY_CATCH for
    	remote_get_trace_status.
    	* tracepoint.c (disconnect_tracing): Ditto.

commit eb084f33f1d9abd777cb0d6fe6e36c866c77c1f5
Author: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
Date:   Thu Jul 7 09:28:08 2011 +0000

    	PR target/39150
    	* configure.ac (i[3456789]86-*-solaris2*): Also accept
    	x86_64-*-solaris2.1[0-9]*.
    	* configure: Regenerate.

commit 4580b7b5912496cf9a3ae48b8361848fde0720cf
Author: aburgess <aburgess>
Date:   Thu Jul 7 08:38:29 2011 +0000

    http://sourceware.org/ml/gdb-patches/2011-07/msg00085.html
    	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
    	variables as signed, not unsigned.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                    |    7 +
 bfd/version.h                                |    2 +-
 configure                                    |    2 +-
 configure.ac                                 |    2 +-
 gdb/ChangeLog                                |   13 +
 gdb/cli/cli-setshow.c                        |   21 +-
 gdb/remote.c                                 |   13 +-
 gdb/testsuite/ChangeLog                      |    5 +
 gdb/testsuite/gdb.arch/amd64-entry-value.exp |    2 +-
 gdb/testsuite/gdb.java/jprint.exp            |   11 +-
 gdb/tracepoint.c                             |   14 +-
 gdb/version.in                               |    2 +-
 sim/ChangeLog                                |    4 +
 sim/MAINTAINERS                              |    1 -
 sim/igen/ChangeLog                           |   35 +++
 sim/igen/filter.c                            |   30 +--
 sim/igen/gen-engine.c                        |  325 ---------------------
 sim/igen/gen-icache.c                        |    2 +
 sim/igen/gen-idecode.c                       |  329 +---------------------
 sim/igen/gen-model.c                         |  398 --------------------------
 sim/igen/gen.c                               |  127 +-------
 sim/igen/ld-insn.c                           |   37 ++-
 sim/igen/misc.h                              |    4 -
 sim/mips/ChangeLog                           |    6 +
 sim/mips/Makefile.in                         |    4 +-
 25 files changed, 154 insertions(+), 1242 deletions(-)

First 500 lines of diff:
diff --git a/ChangeLog b/ChangeLog
index 7875229..8e96373 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR target/39150
+	* configure.ac (i[3456789]86-*-solaris2*): Also accept
+	x86_64-*-solaris2.1[0-9]*.
+	* configure: Regenerate.
+
 2011-06-13  Walter Lee <walt@tilera.com>
 
 	* configure.ac (tilepro-*-*) New case.
diff --git a/bfd/version.h b/bfd/version.h
index 55529d2..f2b4a7d 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20110707
+#define BFD_VERSION_DATE 20110708
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff --git a/configure b/configure
index 9f7055d..e969e12 100755
--- a/configure
+++ b/configure
@@ -3523,7 +3523,7 @@ case "${target}" in
   i[3456789]86-*-sco*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"
     ;;
-  i[3456789]86-*-solaris2*)
+  i[3456789]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   i[3456789]86-*-sysv4*)
diff --git a/configure.ac b/configure.ac
index 98705a1..73d17a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -969,7 +969,7 @@ case "${target}" in
   i[[3456789]]86-*-sco*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"
     ;;
-  i[[3456789]]86-*-solaris2*)
+  i[[3456789]]86-*-solaris2* | x86_64-*-solaris2.1[[0-9]]*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
   i[[3456789]]86-*-sysv4*)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a01bf0a..7a76008 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2011-07-07  Hui Zhu  <teawater@gmail.com>
+
+	Revert:
+	2011-07-06  Hui Zhu  <teawater@gmail.com>
+	* remote.c (remote_start_remote): Add TRY_CATCH for
+	remote_get_trace_status.
+	* tracepoint.c (disconnect_tracing): Ditto.
+
+2011-07-07  Andrew Burgess  <aburgess@broadcom.com>
+
+	* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
+	variables as signed, not unsigned.
+
 2011-07-06  Joel Brobecker  <brobecker@adacore.com>
 
 	* jit.c (jit_inferior_init): Reformat forward declaration.
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..8dbfaad 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -358,21 +358,18 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 	    }
 	  break;
 	case var_uinteger:
-	  if (*(unsigned int *) c->var == UINT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	      break;
-	    }
-	  /* else fall through */
 	case var_zuinteger:
-	case var_zinteger:
-	  fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
+	  if (c->var_type == var_uinteger
+	      && *(unsigned int *) c->var == UINT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
+	  else
+	    fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
 	  break;
 	case var_integer:
-	  if (*(int *) c->var == INT_MAX)
-	    {
-	      fputs_filtered ("unlimited", stb->stream);
-	    }
+	case var_zinteger:
+	  if (c->var_type == var_integer
+	      && *(int *) c->var == INT_MAX)
+	    fputs_filtered ("unlimited", stb->stream);
 	  else
 	    fprintf_filtered (stb->stream, "%d", *(int *) c->var);
 	  break;
diff --git a/gdb/remote.c b/gdb/remote.c
index b03ef59..19cc0b6 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -3146,8 +3146,6 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
   struct remote_state *rs = get_remote_state ();
   struct packet_config *noack_config;
   char *wait_status = NULL;
-  int ret = 0;
-  volatile struct gdb_exception ex;
 
   immediate_quit++;		/* Allow user to interrupt it.  */
 
@@ -3391,16 +3389,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
 
   /* Possibly the target has been engaged in a trace run started
      previously; find out where things are at.  */
-  TRY_CATCH (ex, RETURN_MASK_ERROR)
-    {
-      ret = remote_get_trace_status (current_trace_status ());
-    }
-  if (ex.reason < 0)
-    {
-      warning (_("%s"), ex.message);
-      ret = -1;
-    }
-  if (ret != -1)
+  if (remote_get_trace_status (current_trace_status ()) != -1)
     {
       struct uploaded_tp *uploaded_tps = NULL;
       struct uploaded_tsv *uploaded_tsvs = NULL;
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 276f60b..1f43ffe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.java/jprint.exp (print a java.lang.String): xfail without system
+	debug info.
+
 2011-07-06  Matt Rice  <ratmice@gmail.com>
 
 	* gdb.python/python.exp: Update filename paths.
diff --git a/gdb/testsuite/gdb.arch/amd64-entry-value.exp b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
index 9ac12f9..22a6f04 100644
--- a/gdb/testsuite/gdb.arch/amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.arch/amd64-entry-value.exp
@@ -78,7 +78,7 @@ gdb_test "bt" "^bt\r\n#0 +d \\(i=<optimized out>\\)\[^\r\n\]*\r\n#1 +0x\[0-9a-f\
 # Test self tail calls verification.
 # GDB should not print the real value as it is ambiguous.
 
-gdb_continue_to_breakpoint "ambiguous: breakhere"
+gdb_continue_to_breakpoint "self: breakhere"
 
 # #0  d (i=<optimized out>) at gdb.arch/amd64-entry-value.c:33
 # #1  0x00000000004005df in self (i=<optimized out>) at gdb.arch/amd64-entry-value.c:111
diff --git a/gdb/testsuite/gdb.java/jprint.exp b/gdb/testsuite/gdb.java/jprint.exp
index 81d8ad1..f6ae7ab 100644
--- a/gdb/testsuite/gdb.java/jprint.exp
+++ b/gdb/testsuite/gdb.java/jprint.exp
@@ -71,5 +71,14 @@ if [set_lang_java] then {
     setup_xfail *-*-* gcc/43260
     gdb_test "print *jprint.props" " = .*" "print a java.util.Properties"
 
-    gdb_test "print jprint.hi" "= java.lang.String \"hi maude\"" "print a java.lang.String"
+    set test "print a java.lang.String"
+    gdb_test_multiple "print jprint.hi" $test {
+	-re " = java.lang.String \"hi maude\"\r\n$gdb_prompt $" {
+	    pass $test
+	}
+	-re "There is no member named data\\.\r\n$gdb_prompt $" {
+	    # GCJ system debug info for java.lang.String is not installed.
+	    xfail $test
+	}
+    }
 }
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 4c54d2d..2d62f4d 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1900,23 +1900,11 @@ trace_status_mi (int on_stop)
 void
 disconnect_tracing (int from_tty)
 {
-  int ret = 0;
-  volatile struct gdb_exception ex;
-
   /* It can happen that the target that was tracing went away on its
      own, and we didn't notice.  Get a status update, and if the
      current target doesn't even do tracing, then assume it's not
      running anymore.  */
-  TRY_CATCH (ex, RETURN_MASK_ERROR)
-    {
-      ret = target_get_trace_status (current_trace_status ());
-    }
-  if (ex.reason < 0)
-    {
-      warning (_("%s"), ex.message);
-      ret = -1;
-    }
-  if (ret < 0)
+  if (target_get_trace_status (current_trace_status ()) < 0)
     current_trace_status ()->running = 0;
 
   /* If running interactively, give the user the option to cancel and
diff --git a/gdb/version.in b/gdb/version.in
index 4fa61c5..039f419 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.3.50.20110707-cvs
+7.3.50.20110708-cvs
diff --git a/sim/ChangeLog b/sim/ChangeLog
index 599e9e9..d1c10a9 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-08  Hans-Peter Nilsson  <hp@axis.com>
+
+	* MAINTAINERS: Remove Thiemo Seufer.
+
 2011-06-04  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.tgt (bfin-*-*): Add sim_testsuite=yes.
diff --git a/sim/MAINTAINERS b/sim/MAINTAINERS
index d273002..92c9d5c 100644
--- a/sim/MAINTAINERS
+++ b/sim/MAINTAINERS
@@ -19,7 +19,6 @@ m32c		DJ Delorie <dj@redhat.com>
 m32r		Doug Evans <dje@sebabeach.org>
 m68hc11		Stephane Carrez <stcarrez@nerim.fr>
 microblaze	Michael Eager <eager@eagercon.com>
-mips		Thiemo Seufer <ths@networkno.de>
 moxie		Anthony Green <green@moxielogic.com>
 rx		DJ Delorie <dj@redhat.com>
 sh		(global maintainers)
diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog
index 7d1a9b4..5a6ad48 100644
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@@ -1,3 +1,38 @@
+2011-07-08  Hans-Peter Nilsson  <hp@axis.com>
+
+	* ld-insn.c (print_insn_words): For fields, print conditionals.
+
+	Correct handling of constant named fields.
+	* gen.c (insn_field_cmp): Tweak comment about neither field
+	being an insn_field_string with a cond_eq-to-value condition.
+	(insns_bit_useless) <case insn_field_string, case
+	decode_find_mixed>: Handle cond_eq-to-value fields as
+	insn_field_int.
+	* gen-idecode.c (print_idecode_validate): Handle
+	insn_field_string cond-equal-to-value fields as insn_field_int.
+	* gen-icache.c (print_icache_body): Add comment why constant
+	string fields are handled.
+
+	Remove all #if 0'd code.
+	* filter.c: Remove #if 0'd function it_is.
+	(main): Remove #if 0'd code.
+	* gen-engine.c: Remove #if 0'd functions print_jump,
+	print_jump_insn, print_jump_definition,
+	print_jump_internal_function, print_jump_body.
+	(gen_engine_c): Remove #if 0'd code.
+	* gen-idecode.c: Remove #if 0'd functions print_jump print_jump,
+	print_jump_insn, print_jump_definition,
+	print_jump_internal_function, print_jump_until_stop_body.
+	* gen-model.c: Remove #if 0'd functions model_c_or_h_data,
+	model_c_or_h_function, gen_model_h, model_c_insn,
+	model_c_function, gen_model_c and types model_c_passed_data
+	and struct _model_c_passed_data.
+	* gen.c: Remove #if 0'd type constant_field_types and function
+	insn_field_is_constant.
+	(gen_entry_find_opcode_field): Remove #if 0'd code.
+	* ld-insn.c (parse_insn_model_record): Remove #if 0'd code.
+	* misc.h (STRDUP, STRNDUP): Remove #if 0'd macros.
+
 2011-02-14  Mike Frysinger  <vapier@gentoo.org>
 
 	* table.c (table_push): Change zfree to free.
diff --git a/sim/igen/filter.c b/sim/igen/filter.c
index 5215695..3b36345 100644
--- a/sim/igen/filter.c
+++ b/sim/igen/filter.c
@@ -216,29 +216,6 @@ is_filtered_out (filter *filters, const char *flags)
 }
 
 
-#if 0
-int
-it_is (const char *flag, const char *flags)
-{
-  int flag_len = strlen (flag);
-  while (*flags != '\0')
-    {
-      if (!strncmp (flags, flag, flag_len)
-	  && (flags[flag_len] == ',' || flags[flag_len] == '\0'))
-	return 1;
-      while (*flags != ',')
-	{
-	  if (*flags == '\0')
-	    return 0;
-	  flags++;
-	}
-      flags++;
-    }
-  return 0;
-}
-#endif
-
-
 char *
 filter_next (filter *set, char *member)
 {
@@ -294,12 +271,7 @@ main (int argc, char **argv)
 
   /* dump various info */
   l = lf_open ("-", "stdout", lf_omit_references, lf_is_text, "tmp-filter");
-#if 0
-  if (is_filtered_out (argv[1], superset))
-    lf_printf (l, "excluded\n");
-  else
-    lf_printf (l, "included\n");
-#endif
+
   /* subset */
   {
     dump_filter (l, "{", subset, " }");
diff --git a/sim/igen/gen-engine.c b/sim/igen/gen-engine.c
index dd3a46a..2e9ec7c 100644
--- a/sim/igen/gen-engine.c
+++ b/sim/igen/gen-engine.c
@@ -333,325 +333,6 @@ after all the other CPU's and the event queue have been processed */\n\
 
 /****************************************************************/
 
-#if 0
-static void
-print_jump (lf *file, int is_tail)
-{
-  if (!options.gen.smp)
-    {
-      lf_putstr (file, "if (event_queue_tick (sd))\n");
-      lf_putstr (file, "  {\n");
-      lf_putstr (file, "    CPU_CIA (processor) = nia;\n");
-      lf_putstr (file, "    sim_events_process (sd);\n");
-      lf_putstr (file, "  }\n");
-      lf_putstr (file, "}\n");
-    }
-
-  if (options.gen.smp)
-    {
-      if (is_tail)
-	lf_putstr (file, "cpu_set_program_counter(processor, nia);\n");
-      lf_putstr (file, "current_cpu += 1;\n");
-      lf_putstr (file, "if (current_cpu >= nr_cpus)\n");
-      lf_putstr (file, "  {\n");
-      lf_putstr (file, "    if (sim_events_tick (sd))\n");
-      lf_putstr (file, "      {\n");
-      lf_putstr (file, "        sim_events_process (sd);\n");
-      lf_putstr (file, "      }\n");
-      lf_putstr (file, "    current_cpu = 0;\n");
-      lf_putstr (file, "  }\n");
-      lf_putstr (file, "processor = processors[current_cpu];\n");
-      lf_putstr (file, "nia = cpu_get_program_counter(processor);\n");
-    }
-
-  if (options.gen.icache)
-    {
-      lf_putstr (file, "cache_entry = cpu_icache_entry(processor, nia);\n");
-      lf_putstr (file, "if (cache_entry->address == nia) {\n");
-      lf_putstr (file, "  /* cache hit */\n");
-      lf_putstr (file, "  goto *cache_entry->semantic;\n");
-      lf_putstr (file, "}\n");
-      if (is_tail)
-	{
-	  lf_putstr (file, "goto cache_miss;\n");
-	}
-    }
-
-  if (!options.gen.icache && is_tail)
-    {
-      lf_printf (file, "goto engine;\n");
-    }
-
-}
-#endif
-
-
-#if 0
-static void
-print_jump_insn (lf *file,
-		 insn_entry * instruction,
-		 opcode_bits *expanded_bits,
-		 opcode_field *opcodes, cache_entry *cache_rules)
-{
-  insn_opcodes opcode_path;
-
-  memset (&opcode_path, 0, sizeof (opcode_path));
-  opcode_path.opcode = opcodes;
-
-  /* what we are for the moment */
-  lf_printf (file, "\n");
-  print_my_defines (file,
-		    instruction->name,
-		    instruction->format_name, expanded_bits);
-
-  /* output the icache entry */
-  if (options.gen.icache)
-    {
-      lf_printf (file, "\n");
-      lf_indent (file, -1);
-      print_function_name (file,
-			   instruction->name,
-			   instruction->format_name,
-			   NULL, expanded_bits, function_name_prefix_icache);
-      lf_printf (file, ":\n");
-      lf_indent (file, +1);
-      lf_printf (file, "{\n");
-      lf_indent (file, +2);
-      lf_putstr (file, "const unsigned_word cia = nia;\n");
-      print_itrace (file, instruction, 1 /*putting-value-in-cache */ );
-      print_idecode_validate (file, instruction, &opcode_path);
-      lf_printf (file, "\n");
-      lf_printf (file, "{\n");
-      lf_indent (file, +2);
-      print_icache_body (file, instruction, expanded_bits, cache_rules, 0,	/*use_defines */
-			 put_values_in_icache);
-      lf_printf (file, "cache_entry->address = nia;\n");
-      lf_printf (file, "cache_entry->semantic = &&");
-      print_function_name (file,
-			   instruction->name,
-			   instruction->format_name,
-			   NULL,
-			   expanded_bits, function_name_prefix_semantics);
-      lf_printf (file, ";\n");
-      if (options.gen.semantic_icache)
-	{
-	  print_semantic_body (file,
-			       instruction, expanded_bits, &opcode_path);
-	  print_jump (file, 1 /*is-tail */ );
-	}
-      else
-	{
-	  lf_printf (file, "/* goto ");
-	  print_function_name (file,
-			       instruction->name,
-			       instruction->format_name,
-			       NULL,
-			       expanded_bits, function_name_prefix_semantics);
-	  lf_printf (file, "; */\n");
-	}
-      lf_indent (file, -2);
-      lf_putstr (file, "}\n");
-      lf_indent (file, -2);
-      lf_printf (file, "}\n");
-    }
-
-  /* print the semantics */
-  lf_printf (file, "\n");
-  lf_indent (file, -1);
-  print_function_name (file,
-		       instruction->name,
-		       instruction->format_name,
-		       NULL, expanded_bits, function_name_prefix_semantics);
-  lf_printf (file, ":\n");
-  lf_indent (file, +1);
-  lf_printf (file, "{\n");
-  lf_indent (file, +2);
-  lf_putstr (file, "const unsigned_word cia = nia;\n");
-  print_icache_body (file,
-		     instruction,
-		     expanded_bits,
-		     cache_rules,
-		     (options.gen.direct_access
-		      ? define_variables
-		      : declare_variables),
-		     (options.gen.icache
-		      ? get_values_from_icache : do_not_use_icache));
-  print_semantic_body (file, instruction, expanded_bits, &opcode_path);
-  if (options.gen.direct_access)
-    print_icache_body (file,
-		       instruction,
-		       expanded_bits,
-		       cache_rules,
-		       undef_variables,
-		       (options.gen.icache
-			? get_values_from_icache : do_not_use_icache));
-  print_jump (file, 1 /*is tail */ );
-  lf_indent (file, -2);
-  lf_printf (file, "}\n");
-}
-#endif


hooks/post-receive
--
Repository for Project Archer.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-07-08 12:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-08 12:15 [SCM] archer-jankratochvil-entryval: test fix jkratoch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).