<p>Furquan Shaikh has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26726">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/sconfig: Re-factor emitting of headers to static.c<br><br>This change removes call to add_header from parsing functions and<br>moves it to a local function within main.c. It also adds a new<br>function emit_headers that is responsible for creating the linked list<br>for chip headers and emitting those to static.c<br><br>BUG=b:80081934<br>TEST=Verified that static.c for all files compiled using abuild is the<br>same with and without this change.<br><br>Change-Id: I24d526e81323115d3cc927242a4b9e49414afbe0<br>Signed-off-by: Furquan Shaikh <furquan@google.com><br>---<br>M util/sconfig/main.c<br>M util/sconfig/sconfig.h<br>M util/sconfig/sconfig.tab.c_shipped<br>M util/sconfig/sconfig.y<br>4 files changed, 62 insertions(+), 56 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/26726/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/sconfig/main.c b/util/sconfig/main.c</span><br><span>index f9019bc..264dd20 100644</span><br><span>--- a/util/sconfig/main.c</span><br><span>+++ b/util/sconfig/main.c</span><br><span>@@ -22,8 +22,6 @@</span><br><span> </span><br><span> struct device *head, *lastdev;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct header headers;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct chip *chip_head;</span><br><span> </span><br><span> /*</span><br><span>@@ -244,30 +242,6 @@</span><br><span> return new_chip;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void add_header(struct chip *chip)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int include_exists = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct header *h = &headers;</span><br><span style="color: hsl(0, 100%, 40%);">- while (h->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- int result = strcmp(chip->name, h->next->name);</span><br><span style="color: hsl(0, 100%, 40%);">- if (result == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- include_exists = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (result < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- h = h->next;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!include_exists) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct header *tmp = h->next;</span><br><span style="color: hsl(0, 100%, 40%);">- h->next = malloc(sizeof(struct header));</span><br><span style="color: hsl(0, 100%, 40%);">- memset(h->next, 0, sizeof(struct header));</span><br><span style="color: hsl(0, 100%, 40%);">- h->next->chiph_exists = chip->chiph_exists;</span><br><span style="color: hsl(0, 100%, 40%);">- h->next->name = chip->name;</span><br><span style="color: hsl(0, 100%, 40%);">- h->next->next = tmp;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> struct device *new_device(struct device *parent, struct device *busdev,</span><br><span> struct chip *chip, const int bus, const char *devnum,</span><br><span> int enabled)</span><br><span>@@ -621,10 +595,70 @@</span><br><span> } while (ptr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void add_header(struct chip *chip, struct header *h)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int include_exists = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (h->next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int result = strcmp(chip->name, h->next->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (result == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ include_exists = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (result < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ h = h->next;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!include_exists) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct header *tmp = h->next;</span><br><span style="color: hsl(120, 100%, 40%);">+ h->next = malloc(sizeof(struct header));</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(h->next, 0, sizeof(struct header));</span><br><span style="color: hsl(120, 100%, 40%);">+ h->next->chiph_exists = chip->chiph_exists;</span><br><span style="color: hsl(120, 100%, 40%);">+ h->next->name = chip->name;</span><br><span style="color: hsl(120, 100%, 40%);">+ h->next->next = tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void emit_headers(FILE *fil)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct header *h;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct chip *chip;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct header headers = {};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "emit_headers now!!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ for (chip = chip_head; chip; chip = chip->next)</span><br><span style="color: hsl(120, 100%, 40%);">+ add_header(chip, &headers);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil, "#include <device/device.h>\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil, "#include <device/pci.h>\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ h = &headers;</span><br><span style="color: hsl(120, 100%, 40%);">+ while (h->next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ h = h->next;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (h->chiph_exists)</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil, "#include \"%s/chip.h\"\n", h->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil, "\n#if !DEVTREE_EARLY\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil,</span><br><span style="color: hsl(120, 100%, 40%);">+ "__attribute__((weak)) struct chip_operations mainboard_ops = {};\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ h = &headers;</span><br><span style="color: hsl(120, 100%, 40%);">+ while (h->next) {</span><br><span style="color: hsl(120, 100%, 40%);">+ h = h->next;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name_underscore = translate_name(h->name, UNSLASH);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil,</span><br><span style="color: hsl(120, 100%, 40%);">+ "__attribute__((weak)) struct chip_operations %s_ops = {};\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ name_underscore);</span><br><span style="color: hsl(120, 100%, 40%);">+ free(name_underscore);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(fil, "#endif\n");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void emit_chips(FILE *fil)</span><br><span> {</span><br><span> struct chip *chip;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ emit_headers(fil);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> for (chip = chip_head; chip; chip = chip->next) {</span><br><span> if (!chip->chiph_exists)</span><br><span> continue;</span><br><span>@@ -692,8 +726,6 @@</span><br><span> char *devtree = argv[DEVICEFILE_ARG];</span><br><span> char *outputc = argv[OUTPUTFILE_ARG];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- headers.next = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> FILE *filec = fopen(devtree, "r");</span><br><span> if (!filec) {</span><br><span> perror(NULL);</span><br><span>@@ -716,29 +748,6 @@</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- struct header *h;</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen, "#include <device/device.h>\n");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen, "#include <device/pci.h>\n");</span><br><span style="color: hsl(0, 100%, 40%);">- h = &headers;</span><br><span style="color: hsl(0, 100%, 40%);">- while (h->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- h = h->next;</span><br><span style="color: hsl(0, 100%, 40%);">- if (h->chiph_exists)</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen, "#include \"%s/chip.h\"\n", h->name);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen, "\n#if !DEVTREE_EARLY\n");</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen,</span><br><span style="color: hsl(0, 100%, 40%);">- "__attribute__((weak)) struct chip_operations mainboard_ops = {};\n");</span><br><span style="color: hsl(0, 100%, 40%);">- h = &headers;</span><br><span style="color: hsl(0, 100%, 40%);">- while (h->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- h = h->next;</span><br><span style="color: hsl(0, 100%, 40%);">- char *name_underscore = translate_name(h->name, UNSLASH);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen,</span><br><span style="color: hsl(0, 100%, 40%);">- "__attribute__((weak)) struct chip_operations %s_ops = {};\n",</span><br><span style="color: hsl(0, 100%, 40%);">- name_underscore);</span><br><span style="color: hsl(0, 100%, 40%);">- free(name_underscore);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(autogen, "#endif\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> emit_chips(autogen);</span><br><span> </span><br><span> walk_device_tree(autogen, &root, inherit_subsystem_ids, NULL);</span><br><span>diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h</span><br><span>index b1fbe37..b707448 100644</span><br><span>--- a/util/sconfig/sconfig.h</span><br><span>+++ b/util/sconfig/sconfig.h</span><br><span>@@ -110,7 +110,6 @@</span><br><span> </span><br><span> void postprocess_devtree(void);</span><br><span> struct chip *new_chip(char *path);</span><br><span style="color: hsl(0, 100%, 40%);">-void add_header(struct chip *chip);</span><br><span> struct device *new_device(struct device *parent, struct device *busdev,</span><br><span> struct chip *chip, const int bus, const char *devnum,</span><br><span> int enabled);</span><br><span>diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped</span><br><span>index 7cc3f94..e0d63d4 100644</span><br><span>--- a/util/sconfig/sconfig.tab.c_shipped</span><br><span>+++ b/util/sconfig/sconfig.tab.c_shipped</span><br><span>@@ -487,8 +487,8 @@</span><br><span> static const yytype_uint8 yyrline[] =</span><br><span> {</span><br><span> 0, 36, 36, 36, 38, 38, 38, 38, 40, 40,</span><br><span style="color: hsl(0, 100%, 40%);">- 40, 40, 40, 40, 42, 42, 52, 52, 64, 67,</span><br><span style="color: hsl(0, 100%, 40%);">- 70, 73, 76</span><br><span style="color: hsl(120, 100%, 40%);">+ 40, 40, 40, 40, 42, 42, 51, 51, 63, 66,</span><br><span style="color: hsl(120, 100%, 40%);">+ 69, 72, 75</span><br><span> };</span><br><span> #endif</span><br><span> </span><br><span>@@ -1311,7 +1311,6 @@</span><br><span> </span><br><span> {</span><br><span> cur_chip = pop_chip();</span><br><span style="color: hsl(0, 100%, 40%);">- add_header((yyvsp[-2].chip));</span><br><span> }</span><br><span> </span><br><span> break;</span><br><span>diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y</span><br><span>index 25484d3..e8d6fd3 100755</span><br><span>--- a/util/sconfig/sconfig.y</span><br><span>+++ b/util/sconfig/sconfig.y</span><br><span>@@ -46,7 +46,6 @@</span><br><span> }</span><br><span> chipchildren END {</span><br><span> cur_chip = pop_chip();</span><br><span style="color: hsl(0, 100%, 40%);">- add_header($<chip>3);</span><br><span> };</span><br><span> </span><br><span> device: DEVICE BUS NUMBER /* == devnum */ BOOL {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26726">change 26726</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26726"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I24d526e81323115d3cc927242a4b9e49414afbe0 </div>
<div style="display:none"> Gerrit-Change-Number: 26726 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Furquan Shaikh <furquan@google.com> </div>