Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/yasm/patched-yasm/modules/objfmts/rdf/rdf-objfmt.c

Issue 6170009: Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/yasm/patched-yasm/modules/objfmts/rdf/rdf-objfmt.c
===================================================================
--- third_party/yasm/patched-yasm/modules/objfmts/rdf/rdf-objfmt.c (revision 71129)
+++ third_party/yasm/patched-yasm/modules/objfmts/rdf/rdf-objfmt.c (working copy)
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <util.h>
-/*@unused@*/ RCSID("$Id: rdf-objfmt.c 2166 2009-01-02 08:33:21Z peter $");
+/*@unused@*/ RCSID("$Id: rdf-objfmt.c 2310 2010-03-28 19:28:54Z peter $");
#include <libyasm.h>
@@ -811,10 +811,11 @@
yasm_xfree(objfmt);
}
-static rdf_section_data *
-rdf_objfmt_init_new_section(yasm_object *object, yasm_section *sect,
- const char *sectname, unsigned long line)
+static void
+rdf_objfmt_init_new_section(yasm_section *sect, unsigned long line)
{
+ yasm_object *object = yasm_section_get_object(sect);
+ const char *sectname = yasm_section_get_name(sect);
yasm_objfmt_rdf *objfmt_rdf = (yasm_objfmt_rdf *)object->objfmt;
rdf_section_data *data;
yasm_symrec *sym;
@@ -830,7 +831,6 @@
sym = yasm_symtab_define_label(object->symtab, sectname,
yasm_section_bcs_first(sect), 1, line);
data->sym = sym;
- return data;
}
static yasm_section *
@@ -842,7 +842,7 @@
retval = yasm_object_get_general(object, ".text", 0, 1, 0, &isnew, 0);
if (isnew) {
- rsd = rdf_objfmt_init_new_section(object, retval, ".text", 0);
+ rsd = yasm_section_get_data(retval, &rdf_section_data_cb);
rsd->type = RDF_SECT_CODE;
rsd->reserved = 0;
yasm_section_set_default(retval, 1);
@@ -950,10 +950,7 @@
retval = yasm_object_get_general(object, sectname, 0, 1,
data.type == RDF_SECT_BSS, &isnew, line);
- if (isnew)
- rsd = rdf_objfmt_init_new_section(object, retval, sectname, line);
- else
- rsd = yasm_section_get_data(retval, &rdf_section_data_cb);
+ rsd = yasm_section_get_data(retval, &rdf_section_data_cb);
if (isnew || yasm_section_is_default(retval)) {
yasm_section_set_default(retval, 0);
@@ -1088,6 +1085,7 @@
rdf_objfmt_output,
rdf_objfmt_destroy,
rdf_objfmt_add_default_section,
+ rdf_objfmt_init_new_section,
rdf_objfmt_section_switch,
rdf_objfmt_get_special_sym
};

Powered by Google App Engine
This is Rietveld 408576698