From 4e62efb8f820b245e4c36cea213d63a4843af6e1 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 3 Jun 2002 16:04:31 +0000 Subject: [PATCH] * gen-engine.c (print_run_body): Avoid multi-line strings. * lf.c (lf_print__gnu_copyleft): Likewise. --- sim/igen/ChangeLog | 5 +++++ sim/igen/gen-engine.c | 46 +++++++++++++++++++++++----------------------- sim/igen/lf.c | 42 +++++++++++++++++++++--------------------- 3 files changed, 49 insertions(+), 44 deletions(-) diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog index d5ba8ab..f6cb513 100644 --- a/sim/igen/ChangeLog +++ b/sim/igen/ChangeLog @@ -1,3 +1,8 @@ +2002-06-03 Richard Henderson + + * gen-engine.c (print_run_body): Avoid multi-line strings. + * lf.c (lf_print__gnu_copyleft): Likewise. + 2002-05-01 Chris Demetriou * igen.c: Use 'deprecated' rather than 'depreciated.' diff --git a/sim/igen/gen-engine.c b/sim/igen/gen-engine.c index 4b6861e..ee27e68 100644 --- a/sim/igen/gen-engine.c +++ b/sim/igen/gen-engine.c @@ -98,21 +98,21 @@ print_run_body (lf *file, if (!options.gen.smp) { - lf_putstr (file, " -/* CASE 1: NO SMP (with or with out instruction cache). - -In this case, we can take advantage of the fact that the current -instruction address (CIA) does not need to be read from / written to -the CPU object after the execution of an instruction. - -Instead, CIA is only saved when the main loop exits. This occures -when either sim_engine_halt or sim_engine_restart is called. Both of -these functions save the current instruction address before halting / -restarting the simulator. - -As a variation, there may also be support for an instruction cracking -cache. */ - + lf_putstr (file, "\ +/* CASE 1: NO SMP (with or with out instruction cache).\n\ +\n\ +In this case, we can take advantage of the fact that the current\n\ +instruction address (CIA) does not need to be read from / written to\n\ +the CPU object after the execution of an instruction.\n\ +\n\ +Instead, CIA is only saved when the main loop exits. This occures\n\ +when either sim_engine_halt or sim_engine_restart is called. Both of\n\ +these functions save the current instruction address before halting /\n\ +restarting the simulator.\n\ +\n\ +As a variation, there may also be support for an instruction cracking\n\ +cache. */\n\ +\n\ "); lf_putstr (file, "\n"); @@ -215,14 +215,14 @@ cache. */ if (options.gen.smp) { - lf_putstr (file, " -/* CASE 2: SMP (With or without ICACHE) - -The complexity here comes from needing to correctly halt the simulator -when it is aborted. For instance, if cpu0 requests a restart then -cpu1 will normally be the next cpu that is run. Cpu0 being restarted -after all the other CPU's and the event queue have been processed */ - + lf_putstr (file, "\ +/* CASE 2: SMP (With or without ICACHE)\n\ +\n\ +The complexity here comes from needing to correctly halt the simulator\n\ +when it is aborted. For instance, if cpu0 requests a restart then\n\ +cpu1 will normally be the next cpu that is run. Cpu0 being restarted\n\ +after all the other CPU's and the event queue have been processed */\n\ +\n\ "); lf_putstr (file, "\n"); diff --git a/sim/igen/lf.c b/sim/igen/lf.c index 1b4a5f1..d209858 100644 --- a/sim/igen/lf.c +++ b/sim/igen/lf.c @@ -259,27 +259,27 @@ lf_print__gnu_copyleft (lf *file) case lf_is_c: case lf_is_h: nr += lf_printf(file, "\ -/* This file is part of the program psim. - - Copyright (C) 1994-1997, Andrew Cagney - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -- - - This file was generated by the program %s */ +/* This file is part of the program psim.\n\ +\n\ + Copyright (C) 1994-1997, Andrew Cagney \n\ +\n\ + This program is free software; you can redistribute it and/or modify\n\ + it under the terms of the GNU General Public License as published by\n\ + the Free Software Foundation; either version 2 of the License, or\n\ + (at your option) any later version.\n\ +\n\ + This program is distributed in the hope that it will be useful,\n\ + but WITHOUT ANY WARRANTY; without even the implied warranty of\n\ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\ + GNU General Public License for more details.\n\ + \n\ + You should have received a copy of the GNU General Public License\n\ + along with this program; if not, write to the Free Software\n\ + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n\ +\n\ + --\n\ +\n\ + This file was generated by the program %s */\n\ ", filter_filename(file->program)); break; default: -- 2.7.4