Deleted Added
sdiff udiff text old ( 204431 ) new ( 204433 )
full compact
flattree.c (204431) flattree.c (204433)
1/*
2 * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
3 *
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License as
7 * published by the Free Software Foundation; either version 2 of the
8 * License, or (at your option) any later version.

--- 113 unchanged lines hidden (view full) ---

122}
123
124static void emit_offset_label(FILE *f, const char *label, int offset)
125{
126 fprintf(f, "\t.globl\t%s\n", label);
127 fprintf(f, "%s\t= . + %d\n", label, offset);
128}
129
1/*
2 * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
3 *
4 *
5 * This program is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU General Public License as
7 * published by the Free Software Foundation; either version 2 of the
8 * License, or (at your option) any later version.

--- 113 unchanged lines hidden (view full) ---

122}
123
124static void emit_offset_label(FILE *f, const char *label, int offset)
125{
126 fprintf(f, "\t.globl\t%s\n", label);
127 fprintf(f, "%s\t= . + %d\n", label, offset);
128}
129
130#define ASM_EMIT_BELONG(f, fmt, ...) \
131 { \
132 fprintf((f), "\t.byte\t((" fmt ") >> 24) & 0xff\n", __VA_ARGS__); \
133 fprintf((f), "\t.byte\t((" fmt ") >> 16) & 0xff\n", __VA_ARGS__); \
134 fprintf((f), "\t.byte\t((" fmt ") >> 8) & 0xff\n", __VA_ARGS__); \
135 fprintf((f), "\t.byte\t(" fmt ") & 0xff\n", __VA_ARGS__); \
136 }
137
130static void asm_emit_cell(void *e, cell_t val)
131{
132 FILE *f = e;
133
138static void asm_emit_cell(void *e, cell_t val)
139{
140 FILE *f = e;
141
134 fprintf(f, "\t.long\t0x%x\n", val);
142 fprintf(f, "\t.byte 0x%02x; .byte 0x%02x; .byte 0x%02x; .byte 0x%02x\n",
143 (val >> 24) & 0xff, (val >> 16) & 0xff,
144 (val >> 8) & 0xff, val & 0xff);
135}
136
137static void asm_emit_string(void *e, char *str, int len)
138{
139 FILE *f = e;
140 char c = 0;
141
142 if (len != 0) {

--- 8 unchanged lines hidden (view full) ---

151 str[len] = c;
152 }
153}
154
155static void asm_emit_align(void *e, int a)
156{
157 FILE *f = e;
158
145}
146
147static void asm_emit_string(void *e, char *str, int len)
148{
149 FILE *f = e;
150 char c = 0;
151
152 if (len != 0) {

--- 8 unchanged lines hidden (view full) ---

161 str[len] = c;
162 }
163}
164
165static void asm_emit_align(void *e, int a)
166{
167 FILE *f = e;
168
159 fprintf(f, "\t.balign\t%d\n", a);
169 fprintf(f, "\t.balign\t%d, 0\n", a);
160}
161
162static void asm_emit_data(void *e, struct data d)
163{
164 FILE *f = e;
165 int off = 0;
166 struct marker *m = d.markers;
167
168 for_each_marker_of_type(m, LABEL)
169 emit_offset_label(f, m->ref, m->offset);
170
171 while ((d.len - off) >= sizeof(uint32_t)) {
170}
171
172static void asm_emit_data(void *e, struct data d)
173{
174 FILE *f = e;
175 int off = 0;
176 struct marker *m = d.markers;
177
178 for_each_marker_of_type(m, LABEL)
179 emit_offset_label(f, m->ref, m->offset);
180
181 while ((d.len - off) >= sizeof(uint32_t)) {
172 fprintf(f, "\t.long\t0x%x\n",
173 fdt32_to_cpu(*((uint32_t *)(d.val+off))));
182 asm_emit_cell(e, fdt32_to_cpu(*((uint32_t *)(d.val+off))));
174 off += sizeof(uint32_t);
175 }
176
177 while ((d.len - off) >= 1) {
178 fprintf(f, "\t.byte\t0x%hhx\n", d.val[off]);
179 off += 1;
180 }
181
182 assert(off == d.len);
183}
184
185static void asm_emit_beginnode(void *e, const char *label)
186{
187 FILE *f = e;
188
189 if (label) {
190 fprintf(f, "\t.globl\t%s\n", label);
191 fprintf(f, "%s:\n", label);
192 }
183 off += sizeof(uint32_t);
184 }
185
186 while ((d.len - off) >= 1) {
187 fprintf(f, "\t.byte\t0x%hhx\n", d.val[off]);
188 off += 1;
189 }
190
191 assert(off == d.len);
192}
193
194static void asm_emit_beginnode(void *e, const char *label)
195{
196 FILE *f = e;
197
198 if (label) {
199 fprintf(f, "\t.globl\t%s\n", label);
200 fprintf(f, "%s:\n", label);
201 }
193 fprintf(f, "\t.long\tFDT_BEGIN_NODE\n");
202 fprintf(f, "\t/* FDT_BEGIN_NODE */\n");
203 asm_emit_cell(e, FDT_BEGIN_NODE);
194}
195
196static void asm_emit_endnode(void *e, const char *label)
197{
198 FILE *f = e;
199
204}
205
206static void asm_emit_endnode(void *e, const char *label)
207{
208 FILE *f = e;
209
200 fprintf(f, "\t.long\tFDT_END_NODE\n");
210 fprintf(f, "\t/* FDT_END_NODE */\n");
211 asm_emit_cell(e, FDT_END_NODE);
201 if (label) {
202 fprintf(f, "\t.globl\t%s_end\n", label);
203 fprintf(f, "%s_end:\n", label);
204 }
205}
206
207static void asm_emit_property(void *e, const char *label)
208{
209 FILE *f = e;
210
211 if (label) {
212 fprintf(f, "\t.globl\t%s\n", label);
213 fprintf(f, "%s:\n", label);
214 }
212 if (label) {
213 fprintf(f, "\t.globl\t%s_end\n", label);
214 fprintf(f, "%s_end:\n", label);
215 }
216}
217
218static void asm_emit_property(void *e, const char *label)
219{
220 FILE *f = e;
221
222 if (label) {
223 fprintf(f, "\t.globl\t%s\n", label);
224 fprintf(f, "%s:\n", label);
225 }
215 fprintf(f, "\t.long\tFDT_PROP\n");
226 fprintf(f, "\t/* FDT_PROP */\n");
227 asm_emit_cell(e, FDT_PROP);
216}
217
218static struct emitter asm_emitter = {
219 .cell = asm_emit_cell,
220 .string = asm_emit_string,
221 .align = asm_emit_align,
222 .data = asm_emit_data,
223 .beginnode = asm_emit_beginnode,

--- 184 unchanged lines hidden (view full) ---

408 blob = data_merge(blob, strbuf);
409
410 /*
411 * If the user asked for more space than is used, pad out the blob.
412 */
413 if (padlen > 0)
414 blob = data_append_zeroes(blob, padlen);
415
228}
229
230static struct emitter asm_emitter = {
231 .cell = asm_emit_cell,
232 .string = asm_emit_string,
233 .align = asm_emit_align,
234 .data = asm_emit_data,
235 .beginnode = asm_emit_beginnode,

--- 184 unchanged lines hidden (view full) ---

420 blob = data_merge(blob, strbuf);
421
422 /*
423 * If the user asked for more space than is used, pad out the blob.
424 */
425 if (padlen > 0)
426 blob = data_append_zeroes(blob, padlen);
427
416 fwrite(blob.val, blob.len, 1, f);
428 if (fwrite(blob.val, blob.len, 1, f) != 1) {
429 if (ferror(f))
430 die("Error writing device tree blob: %s\n",
431 strerror(errno));
432 else
433 die("Short write on device tree blob\n");
434 }
417
435
418 if (ferror(f))
419 die("Error writing device tree blob: %s\n", strerror(errno));
420
421 /*
422 * data_merge() frees the right-hand element so only the blob
423 * remains to be freed.
424 */
425 data_free(blob);
426}
427
428static void dump_stringtable_asm(FILE *f, struct data strbuf)

--- 21 unchanged lines hidden (view full) ---

450 for (i = 0; i < ARRAY_SIZE(version_table); i++) {
451 if (version_table[i].version == version)
452 vi = &version_table[i];
453 }
454 if (!vi)
455 die("Unknown device tree blob version %d\n", version);
456
457 fprintf(f, "/* autogenerated by dtc, do not edit */\n\n");
436 /*
437 * data_merge() frees the right-hand element so only the blob
438 * remains to be freed.
439 */
440 data_free(blob);
441}
442
443static void dump_stringtable_asm(FILE *f, struct data strbuf)

--- 21 unchanged lines hidden (view full) ---

465 for (i = 0; i < ARRAY_SIZE(version_table); i++) {
466 if (version_table[i].version == version)
467 vi = &version_table[i];
468 }
469 if (!vi)
470 die("Unknown device tree blob version %d\n", version);
471
472 fprintf(f, "/* autogenerated by dtc, do not edit */\n\n");
458 fprintf(f, "#define FDT_MAGIC 0x%x\n", FDT_MAGIC);
459 fprintf(f, "#define FDT_BEGIN_NODE 0x%x\n", FDT_BEGIN_NODE);
460 fprintf(f, "#define FDT_END_NODE 0x%x\n", FDT_END_NODE);
461 fprintf(f, "#define FDT_PROP 0x%x\n", FDT_PROP);
462 fprintf(f, "#define FDT_END 0x%x\n", FDT_END);
463 fprintf(f, "\n");
464
465 emit_label(f, symprefix, "blob_start");
466 emit_label(f, symprefix, "header");
473
474 emit_label(f, symprefix, "blob_start");
475 emit_label(f, symprefix, "header");
467 fprintf(f, "\t.long\tFDT_MAGIC\t\t\t\t/* magic */\n");
468 fprintf(f, "\t.long\t_%s_blob_abs_end - _%s_blob_start\t/* totalsize */\n",
476 fprintf(f, "\t/* magic */\n");
477 asm_emit_cell(f, FDT_MAGIC);
478 fprintf(f, "\t/* totalsize */\n");
479 ASM_EMIT_BELONG(f, "_%s_blob_abs_end - _%s_blob_start",
480 symprefix, symprefix);
481 fprintf(f, "\t/* off_dt_struct */\n");
482 ASM_EMIT_BELONG(f, "_%s_struct_start - _%s_blob_start",
469 symprefix, symprefix);
483 symprefix, symprefix);
470 fprintf(f, "\t.long\t_%s_struct_start - _%s_blob_start\t/* off_dt_struct */\n",
484 fprintf(f, "\t/* off_dt_strings */\n");
485 ASM_EMIT_BELONG(f, "_%s_strings_start - _%s_blob_start",
471 symprefix, symprefix);
486 symprefix, symprefix);
472 fprintf(f, "\t.long\t_%s_strings_start - _%s_blob_start\t/* off_dt_strings */\n",
487 fprintf(f, "\t/* off_mem_rsvmap */\n");
488 ASM_EMIT_BELONG(f, "_%s_reserve_map - _%s_blob_start",
473 symprefix, symprefix);
489 symprefix, symprefix);
474 fprintf(f, "\t.long\t_%s_reserve_map - _%s_blob_start\t/* off_dt_strings */\n",
475 symprefix, symprefix);
476 fprintf(f, "\t.long\t%d\t\t\t\t\t/* version */\n", vi->version);
477 fprintf(f, "\t.long\t%d\t\t\t\t\t/* last_comp_version */\n",
478 vi->last_comp_version);
490 fprintf(f, "\t/* version */\n");
491 asm_emit_cell(f, vi->version);
492 fprintf(f, "\t/* last_comp_version */\n");
493 asm_emit_cell(f, vi->last_comp_version);
479
494
480 if (vi->flags & FTF_BOOTCPUID)
481 fprintf(f, "\t.long\t%i\t\t\t\t\t/* boot_cpuid_phys */\n",
482 bi->boot_cpuid_phys);
495 if (vi->flags & FTF_BOOTCPUID) {
496 fprintf(f, "\t/* boot_cpuid_phys */\n");
497 asm_emit_cell(f, bi->boot_cpuid_phys);
498 }
483
499
484 if (vi->flags & FTF_STRTABSIZE)
485 fprintf(f, "\t.long\t_%s_strings_end - _%s_strings_start\t/* size_dt_strings */\n",
486 symprefix, symprefix);
500 if (vi->flags & FTF_STRTABSIZE) {
501 fprintf(f, "\t/* size_dt_strings */\n");
502 ASM_EMIT_BELONG(f, "_%s_strings_end - _%s_strings_start",
503 symprefix, symprefix);
504 }
487
505
488 if (vi->flags & FTF_STRUCTSIZE)
489 fprintf(f, "\t.long\t_%s_struct_end - _%s_struct_start\t/* size_dt_struct */\n",
506 if (vi->flags & FTF_STRUCTSIZE) {
507 fprintf(f, "\t/* size_dt_struct */\n");
508 ASM_EMIT_BELONG(f, "_%s_struct_end - _%s_struct_start",
490 symprefix, symprefix);
509 symprefix, symprefix);
510 }
491
492 /*
493 * Reserve map entries.
494 * Align the reserve map to a doubleword boundary.
495 * Each entry is an (address, size) pair of u64 values.
496 * Always supply a zero-sized temination entry.
497 */
498 asm_emit_align(f, 8);

--- 5 unchanged lines hidden (view full) ---

504 * Use .long on high and low halfs of u64s to avoid .quad
505 * as it appears .quad isn't available in some assemblers.
506 */
507 for (re = bi->reservelist; re; re = re->next) {
508 if (re->label) {
509 fprintf(f, "\t.globl\t%s\n", re->label);
510 fprintf(f, "%s:\n", re->label);
511 }
511
512 /*
513 * Reserve map entries.
514 * Align the reserve map to a doubleword boundary.
515 * Each entry is an (address, size) pair of u64 values.
516 * Always supply a zero-sized temination entry.
517 */
518 asm_emit_align(f, 8);

--- 5 unchanged lines hidden (view full) ---

524 * Use .long on high and low halfs of u64s to avoid .quad
525 * as it appears .quad isn't available in some assemblers.
526 */
527 for (re = bi->reservelist; re; re = re->next) {
528 if (re->label) {
529 fprintf(f, "\t.globl\t%s\n", re->label);
530 fprintf(f, "%s:\n", re->label);
531 }
512 fprintf(f, "\t.long\t0x%08x, 0x%08x\n",
513 (unsigned int)(re->re.address >> 32),
514 (unsigned int)(re->re.address & 0xffffffff));
515 fprintf(f, "\t.long\t0x%08x, 0x%08x\n",
516 (unsigned int)(re->re.size >> 32),
517 (unsigned int)(re->re.size & 0xffffffff));
532 ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.address >> 32));
533 ASM_EMIT_BELONG(f, "0x%08x",
534 (unsigned int)(re->re.address & 0xffffffff));
535 ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size >> 32));
536 ASM_EMIT_BELONG(f, "0x%08x", (unsigned int)(re->re.size & 0xffffffff));
518 }
519 for (i = 0; i < reservenum; i++) {
520 fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
521 }
522
523 fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
524
525 emit_label(f, symprefix, "struct_start");
526 flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi);
537 }
538 for (i = 0; i < reservenum; i++) {
539 fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
540 }
541
542 fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
543
544 emit_label(f, symprefix, "struct_start");
545 flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi);
527 fprintf(f, "\t.long\tFDT_END\n");
546
547 fprintf(f, "\t/* FDT_END */\n");
548 asm_emit_cell(f, FDT_END);
528 emit_label(f, symprefix, "struct_end");
529
530 emit_label(f, symprefix, "strings_start");
531 dump_stringtable_asm(f, strbuf);
532 emit_label(f, symprefix, "strings_end");
533
534 emit_label(f, symprefix, "blob_end");
535

--- 60 unchanged lines hidden (view full) ---

596 char *str;
597
598 do {
599 if (p >= inb->limit)
600 die("Premature end of data parsing flat device tree\n");
601 len++;
602 } while ((*p++) != '\0');
603
549 emit_label(f, symprefix, "struct_end");
550
551 emit_label(f, symprefix, "strings_start");
552 dump_stringtable_asm(f, strbuf);
553 emit_label(f, symprefix, "strings_end");
554
555 emit_label(f, symprefix, "blob_end");
556

--- 60 unchanged lines hidden (view full) ---

617 char *str;
618
619 do {
620 if (p >= inb->limit)
621 die("Premature end of data parsing flat device tree\n");
622 len++;
623 } while ((*p++) != '\0');
624
604 str = strdup(inb->ptr);
625 str = xstrdup(inb->ptr);
605
606 inb->ptr += len;
607
608 flat_realign(inb, sizeof(uint32_t));
609
610 return str;
611}
612

--- 25 unchanged lines hidden (view full) ---

638 offset);
639
640 if (*p == '\0')
641 break;
642
643 p++;
644 }
645
626
627 inb->ptr += len;
628
629 flat_realign(inb, sizeof(uint32_t));
630
631 return str;
632}
633

--- 25 unchanged lines hidden (view full) ---

659 offset);
660
661 if (*p == '\0')
662 break;
663
664 p++;
665 }
666
646 return strdup(inb->base + offset);
667 return xstrdup(inb->base + offset);
647}
648
649static struct property *flat_read_property(struct inbuf *dtbuf,
650 struct inbuf *strbuf, int flags)
651{
652 uint32_t proplen, stroff;
653 char *name;
654 struct data val;

--- 50 unchanged lines hidden (view full) ---

705 if (!strneq(ppath, cpath, plen))
706 die("Path \"%s\" is not valid as a child of \"%s\"\n",
707 cpath, ppath);
708
709 /* root node is a special case */
710 if (!streq(ppath, "/"))
711 plen++;
712
668}
669
670static struct property *flat_read_property(struct inbuf *dtbuf,
671 struct inbuf *strbuf, int flags)
672{
673 uint32_t proplen, stroff;
674 char *name;
675 struct data val;

--- 50 unchanged lines hidden (view full) ---

726 if (!strneq(ppath, cpath, plen))
727 die("Path \"%s\" is not valid as a child of \"%s\"\n",
728 cpath, ppath);
729
730 /* root node is a special case */
731 if (!streq(ppath, "/"))
732 plen++;
733
713 return strdup(cpath + plen);
734 return xstrdup(cpath + plen);
714}
715
716static struct node *unflatten_tree(struct inbuf *dtbuf,
717 struct inbuf *strbuf,
718 const char *parent_flatname, int flags)
719{
720 struct node *node;
721 char *flatname;

--- 185 unchanged lines hidden --- 		735}
736
737static struct node *unflatten_tree(struct inbuf *dtbuf,
738 struct inbuf *strbuf,
739 const char *parent_flatname, int flags)
740{
741 struct node *node;
742 char *flatname;

--- 185 unchanged lines hidden ---