d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence GCC warnings about multi-line strings.

Browse Source 
Sync Perforce IDs.
This commit is contained in:
Justin T. Gibbs 2002-06-05 22:51:54 +00:00
parent eda578ae9f
commit 9b2af00eda
7 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
sys/dev/aic7xxx/aicasm/aicasm.c
View File

@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#14 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#17 $
*
* $FreeBSD$
*/
@ -288,9 +288,9 @@ usage()
{
(void)fprintf(stderr,
"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file]
[-r register_output_file] [-l program_list_file]
input_file\n",
"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file]\n"
" [-r register_output_file] [-l program_list_file]\n"
" input_file\n",
appname);
exit(EX_USAGE);
}
@ -335,11 +335,11 @@ output_code()
instrcount = 0;
fprintf(ofile,
"/*
* DO NOT EDIT - This file is automatically generated
* from the following source files:
*
%s */\n", versions);
"/*\n"
" * DO NOT EDIT - This file is automatically generated\n"
" * from the following source files:\n"
" *\n"
"%s */\n", versions);
fprintf(ofile, "static uint8_t seqprog[] = {\n");
for (cur_instr = STAILQ_FIRST(&seq_program);
@ -374,13 +374,13 @@ output_code()
cur_node != NULL;
cur_node = SLIST_NEXT(cur_node,links)) {
fprintf(ofile,
"static int aic_patch%d_func(%s);
static int
aic_patch%d_func(%s)
{
return (%s);
}\n\n",
"static int aic_patch%d_func(%s);\n"
"\n"
"static int\n"
"aic_patch%d_func(%s)\n"
"{\n"
" return (%s);\n"
"}\n\n",
cur_node->symbol->info.condinfo->func_num,
patch_arg_list,
cur_node->symbol->info.condinfo->func_num,
@ -389,44 +389,44 @@ aic_patch%d_func(%s)
}
fprintf(ofile,
"typedef int patch_func_t (%s);
static struct patch {
patch_func_t *patch_func;
uint32_t begin :10,
skip_instr :10,
skip_patch :12;
} patches[] = {\n", patch_arg_list);
"typedef int patch_func_t (%s);\n"
"static struct patch {\n"
" patch_func_t *patch_func;\n"
" uint32_t begin :10,\n"
" skip_instr :10,\n"
" skip_patch :12;\n"
"} patches[] = {\n", patch_arg_list);
for(cur_patch = STAILQ_FIRST(&patches);
cur_patch != NULL;
cur_patch = STAILQ_NEXT(cur_patch,links)) {
for (cur_patch = STAILQ_FIRST(&patches);
cur_patch != NULL;
cur_patch = STAILQ_NEXT(cur_patch,links)) {
fprintf(ofile, "%s\t{ aic_patch%d_func, %d, %d, %d }",
cur_patch == STAILQ_FIRST(&patches) ? "" : ",\n",
cur_patch->patch_func, cur_patch->begin,
cur_patch->skip_instr, cur_patch->skip_patch);
}
fprintf(ofile, "\n};\n");
fprintf(ofile, "\n};\n\n");
fprintf(ofile,
"static struct cs {
u_int16_t begin;
u_int16_t end;
} critical_sections[] = {\n");
"static struct cs {\n"
" u_int16_t begin;\n"
" u_int16_t end;\n"
"} critical_sections[] = {\n");
for(cs = TAILQ_FIRST(&cs_tailq);
cs != NULL;
cs = TAILQ_NEXT(cs, links)) {
for (cs = TAILQ_FIRST(&cs_tailq);
cs != NULL;
cs = TAILQ_NEXT(cs, links)) {
fprintf(ofile, "%s\t{ %d, %d }",
cs == TAILQ_FIRST(&cs_tailq) ? "" : ",\n",
cs->begin_addr, cs->end_addr);
}
fprintf(ofile, "\n};\n");
fprintf(ofile, "\n};\n\n");
fprintf(ofile,
"static const int num_critical_sections = sizeof(critical_sections)
/ sizeof(*critical_sections);\n");
"static const int num_critical_sections = sizeof(critical_sections)\n"
" / sizeof(*critical_sections);\n");
fprintf(stderr, "%s: %d instructions used\n", appname, instrcount);
}
@ -569,9 +569,9 @@ output_listing(char *ifilename)
/* Now output the listing */
cur_patch = STAILQ_FIRST(&patches);
for(cur_instr = STAILQ_FIRST(&seq_program);
cur_instr != NULL;
cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) {
for (cur_instr = STAILQ_FIRST(&seq_program);
cur_instr != NULL;
cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) {
if (check_patch(&cur_patch, instrcount,
&skip_addr, func_values) == 0) {

2
sys/dev/aic7xxx/aicasm/aicasm.h
View File

@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#9 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#10 $
*
* $FreeBSD$
*/

2
sys/dev/aic7xxx/aicasm/aicasm_gram.y
View File

@ -38,7 +38,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#14 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#15 $
*
* $FreeBSD$
*/

2
sys/dev/aic7xxx/aicasm/aicasm_insformat.h
View File

@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#8 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#9 $
*
* $FreeBSD$
*/

2
sys/dev/aic7xxx/aicasm/aicasm_scan.l
View File

@ -38,7 +38,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#10 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#11 $
*
* $FreeBSD$
*/

2
sys/dev/aic7xxx/aicasm/aicasm_symbol.c
View File

@ -36,7 +36,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.c#13 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.c#14 $
*
* $FreeBSD$
*/

2
sys/dev/aic7xxx/aicasm/aicasm_symbol.h
View File

@ -36,7 +36,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.h#10 $
* $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_symbol.h#11 $
*
* $FreeBSD$
*/