[PATCH] kallsyms C_SYMBOL_PREFIX support

kallsyms does not consider SYMBOL_PREFIX of C. Consequently it does not work on architectures using that prefix character (h8300, v850). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] kallsyms C_SYMBOL_PREFIX support
kallsyms does not consider SYMBOL_PREFIX of C. Consequently it does not work on architectures using that prefix character (h8300, v850). Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Yoshinori Sato · Linus Torvalds
1 parent 6c9e7376be
Showing 1 changed file with 56 additions and 20 deletions Side-by-side Diff
scripts/kallsyms.c
@@ -69,6 +69,7 @@
 static int size, cnt;
 static unsigned long long _stext, _etext, _sinittext, _einittext;
 static int all_symbols = 0;
+static char symbol_prefix_char = '\0';
  
 struct token {
 	unsigned char data[MAX_TOK_SIZE];
@@ -93,7 +94,7 @@
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: kallsyms [--all-symbols] < in.map > out.S\n");
+	fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
 	exit(1);
 }
  
@@ -112,6 +113,7 @@
 read_symbol(FILE *in, struct sym_entry *s)
 {
 	char str[500];
+	char *sym;
 	int rc;
  
 	rc = fscanf(in, "%llx %c %499s\n", &s->addr, &s->type, str);
  
  
  
  
  
  
@@ -123,27 +125,32 @@
 		return -1;
 	}
  
+	sym = str;
+	/* skip prefix char */
+	if (symbol_prefix_char && str[0] == symbol_prefix_char)
+		sym++;
+
 	/* Ignore most absolute/undefined (?) symbols. */
-	if (strcmp(str, "_stext") == 0)
+	if (strcmp(sym, "_stext") == 0)
 		_stext = s->addr;
-	else if (strcmp(str, "_etext") == 0)
+	else if (strcmp(sym, "_etext") == 0)
 		_etext = s->addr;
-	else if (strcmp(str, "_sinittext") == 0)
+	else if (strcmp(sym, "_sinittext") == 0)
 		_sinittext = s->addr;
-	else if (strcmp(str, "_einittext") == 0)
+	else if (strcmp(sym, "_einittext") == 0)
 		_einittext = s->addr;
 	else if (toupper(s->type) == 'A')
 	{
 		/* Keep these useful absolute symbols */
-		if (strcmp(str, "__kernel_syscall_via_break") &&
-		    strcmp(str, "__kernel_syscall_via_epc") &&
-		    strcmp(str, "__kernel_sigtramp") &&
-		    strcmp(str, "__gp"))
+		if (strcmp(sym, "__kernel_syscall_via_break") &&
+		    strcmp(sym, "__kernel_syscall_via_epc") &&
+		    strcmp(sym, "__kernel_sigtramp") &&
+		    strcmp(sym, "__gp"))
 			return -1;
  
 	}
 	else if (toupper(s->type) == 'U' ||
-		 is_arm_mapping_symbol(str))
+		 is_arm_mapping_symbol(sym))
 		return -1;
  
 	/* include the type field in the symbol name, so that it gets
  
@@ -177,7 +184,12 @@
 		"_SDA2_BASE_",		/* ppc */
 		NULL };
 	int i;
+	int offset = 1;
  
+	/* skip prefix char */
+	if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
+		offset++;
+
 	/* if --all-symbols is not specified, then symbols outside the text
 	 * and inittext sections are discarded */
 	if (!all_symbols) {
  
  
@@ -190,17 +202,17 @@
 		 * they may get dropped in pass 2, which breaks the kallsyms
 		 * rules.
 		 */
-		if ((s->addr == _etext && strcmp(s->sym + 1, "_etext")) ||
-		    (s->addr == _einittext && strcmp(s->sym + 1, "_einittext")))
+		if ((s->addr == _etext && strcmp(s->sym + offset, "_etext")) ||
+		    (s->addr == _einittext && strcmp(s->sym + offset, "_einittext")))
 			return 0;
 	}
  
 	/* Exclude symbols which vary between passes. */
-	if (strstr(s->sym + 1, "_compiled."))
+	if (strstr(s->sym + offset, "_compiled."))
 		return 0;
  
 	for (i = 0; special_symbols[i]; i++)
-		if( strcmp(s->sym + 1, special_symbols[i]) == 0 )
+		if( strcmp(s->sym + offset, special_symbols[i]) == 0 )
 			return 0;
  
 	return 1;
  
@@ -225,9 +237,15 @@
  
 static void output_label(char *label)
 {
-	printf(".globl %s\n",label);
+	if (symbol_prefix_char)
+		printf(".globl %c%s\n", symbol_prefix_char, label);
+	else
+		printf(".globl %s\n", label);
 	printf("\tALGN\n");
-	printf("%s:\n",label);
+	if (symbol_prefix_char)
+		printf("%c%s:\n", symbol_prefix_char, label);
+	else
+		printf("%s:\n", label);
 }
  
 /* uncompress a compressed symbol. When this function is called, the best table
@@ -665,6 +683,13 @@
  
 	insert_real_symbols_in_table();
  
+	/* When valid symbol is not registered, exit to error */
+	if (good_head.left == good_head.right &&
+	    bad_head.left == bad_head.right) {
+		fprintf(stderr, "No valid symbol.\n");
+		exit(1);
+	}
+
 	optimize_result();
 }
  
@@ -672,9 +697,21 @@
 int
 main(int argc, char **argv)
 {
-	if (argc == 2 && strcmp(argv[1], "--all-symbols") == 0)
-		all_symbols = 1;
-	else if (argc != 1)
+	if (argc >= 2) {
+		int i;
+		for (i = 1; i < argc; i++) {
+			if(strcmp(argv[i], "--all-symbols") == 0)
+				all_symbols = 1;
+			else if (strncmp(argv[i], "--symbol-prefix=", 16) == 0) {
+				char *p = &argv[i][16];
+				/* skip quote */
+				if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
+					p++;
+				symbol_prefix_char = *p;
+			} else
+				usage();
+		}
+	} else if (argc != 1)
 		usage();
  
 	read_map(stdin);
...	...	@@ -69,6 +69,7 @@
69	69	static int size, cnt;
70	70	static unsigned long long _stext, _etext, _sinittext, _einittext;
71	71	static int all_symbols = 0;
	72	+static char symbol_prefix_char = '\0';
72	73
73	74	struct token {
74	75	unsigned char data[MAX_TOK_SIZE];
...	...	@@ -93,7 +94,7 @@
93	94	static void
94	95	usage(void)
95	96	{
96		- fprintf(stderr, "Usage: kallsyms [--all-symbols] < in.map > out.S\n");
	97	+ fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
97	98	exit(1);
98	99	}
99	100
...	...	@@ -112,6 +113,7 @@
112	113	read_symbol(FILE in, struct sym_entry s)
113	114	{
114	115	char str[500];
	116	+ char *sym;
115	117	int rc;
116	118
117	119	rc = fscanf(in, "%llx %c %499s\n", &s->addr, &s->type, str);
118	120
119	121
120	122
121	123
122	124
123	125
...	...	@@ -123,27 +125,32 @@
123	125	return -1;
124	126	}
125	127
	128	+ sym = str;
	129	+ /* skip prefix char */
	130	+ if (symbol_prefix_char && str[0] == symbol_prefix_char)
	131	+ sym++;
	132	+
126	133	/* Ignore most absolute/undefined (?) symbols. */
127		- if (strcmp(str, "_stext") == 0)
	134	+ if (strcmp(sym, "_stext") == 0)
128	135	_stext = s->addr;
129		- else if (strcmp(str, "_etext") == 0)
	136	+ else if (strcmp(sym, "_etext") == 0)
130	137	_etext = s->addr;
131		- else if (strcmp(str, "_sinittext") == 0)
	138	+ else if (strcmp(sym, "_sinittext") == 0)
132	139	_sinittext = s->addr;
133		- else if (strcmp(str, "_einittext") == 0)
	140	+ else if (strcmp(sym, "_einittext") == 0)
134	141	_einittext = s->addr;
135	142	else if (toupper(s->type) == 'A')
136	143	{
137	144	/* Keep these useful absolute symbols */
138		- if (strcmp(str, "__kernel_syscall_via_break") &&
139		- strcmp(str, "__kernel_syscall_via_epc") &&
140		- strcmp(str, "__kernel_sigtramp") &&
141		- strcmp(str, "__gp"))
	145	+ if (strcmp(sym, "__kernel_syscall_via_break") &&
	146	+ strcmp(sym, "__kernel_syscall_via_epc") &&
	147	+ strcmp(sym, "__kernel_sigtramp") &&
	148	+ strcmp(sym, "__gp"))
142	149	return -1;
143	150
144	151	}
145	152	else if (toupper(s->type) == 'U' \|\|
146		- is_arm_mapping_symbol(str))
	153	+ is_arm_mapping_symbol(sym))
147	154	return -1;
148	155
149	156	/* include the type field in the symbol name, so that it gets
150	157
...	...	@@ -177,7 +184,12 @@
177	184	"_SDA2_BASE_", /* ppc */
178	185	NULL };
179	186	int i;
	187	+ int offset = 1;
180	188
	189	+ /* skip prefix char */
	190	+ if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
	191	+ offset++;
	192	+
181	193	/* if --all-symbols is not specified, then symbols outside the text
182	194	* and inittext sections are discarded */
183	195	if (!all_symbols) {
184	196
185	197
...	...	@@ -190,17 +202,17 @@
190	202	* they may get dropped in pass 2, which breaks the kallsyms
191	203	* rules.
192	204	*/
193		- if ((s->addr == _etext && strcmp(s->sym + 1, "_etext")) \|\|
194		- (s->addr == _einittext && strcmp(s->sym + 1, "_einittext")))
	205	+ if ((s->addr == _etext && strcmp(s->sym + offset, "_etext")) \|\|
	206	+ (s->addr == _einittext && strcmp(s->sym + offset, "_einittext")))
195	207	return 0;
196	208	}
197	209
198	210	/* Exclude symbols which vary between passes. */
199		- if (strstr(s->sym + 1, "_compiled."))
	211	+ if (strstr(s->sym + offset, "_compiled."))
200	212	return 0;
201	213
202	214	for (i = 0; special_symbols[i]; i++)
203		- if( strcmp(s->sym + 1, special_symbols[i]) == 0 )
	215	+ if( strcmp(s->sym + offset, special_symbols[i]) == 0 )
204	216	return 0;
205	217
206	218	return 1;
207	219
...	...	@@ -225,9 +237,15 @@
225	237
226	238	static void output_label(char *label)
227	239	{
228		- printf(".globl %s\n",label);
	240	+ if (symbol_prefix_char)
	241	+ printf(".globl %c%s\n", symbol_prefix_char, label);
	242	+ else
	243	+ printf(".globl %s\n", label);
229	244	printf("\tALGN\n");
230		- printf("%s:\n",label);
	245	+ if (symbol_prefix_char)
	246	+ printf("%c%s:\n", symbol_prefix_char, label);
	247	+ else
	248	+ printf("%s:\n", label);
231	249	}
232	250
233	251	/* uncompress a compressed symbol. When this function is called, the best table
...	...	@@ -665,6 +683,13 @@
665	683
666	684	insert_real_symbols_in_table();
667	685
	686	+ /* When valid symbol is not registered, exit to error */
	687	+ if (good_head.left == good_head.right &&
	688	+ bad_head.left == bad_head.right) {
	689	+ fprintf(stderr, "No valid symbol.\n");
	690	+ exit(1);
	691	+ }
	692	+
668	693	optimize_result();
669	694	}
670	695
...	...	@@ -672,9 +697,21 @@
672	697	int
673	698	main(int argc, char **argv)
674	699	{
675		- if (argc == 2 && strcmp(argv[1], "--all-symbols") == 0)
676		- all_symbols = 1;
677		- else if (argc != 1)
	700	+ if (argc >= 2) {
	701	+ int i;
	702	+ for (i = 1; i < argc; i++) {
	703	+ if(strcmp(argv[i], "--all-symbols") == 0)
	704	+ all_symbols = 1;
	705	+ else if (strncmp(argv[i], "--symbol-prefix=", 16) == 0) {
	706	+ char *p = &argv[i][16];
	707	+ /* skip quote */
	708	+ if ((p == '"' && (p+2) == '"') \|\| (p == '\'' && (p+2) == '\''))
	709	+ p++;
	710	+ symbol_prefix_char = *p;
	711	+ } else
	712	+ usage();
	713	+ }
	714	+ } else if (argc != 1)
678	715	usage();
679	716
680	717	read_map(stdin);