Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd296721 authored by Stephen Warren's avatar Stephen Warren Committed by Rob Herring
Browse files

dtc: import latest upstream dtc 

This updates scripts/dtc to commit 317a5d9 "dtc: zero out new label
objects" from git://git.jdl.com/software/dtc.git

.

This adds features such as:
* /bits/ syntax for cell data.
* Math expressions within cell data.
* The ability to delete properties or nodes.
* Support for #line directives in the input file, which allows the use of
  cpp on *.dts.
* -i command-line option (/include/ path)
* -W/-E command-line options for error/warning control.
* Removal of spew to STDOUT containing the filename being compiled.
* Many additions to the libfdt API.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarJon Loeliger <jdl@jdl.com>
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent acc20979

scripts/dtc/Makefile.dtc

+11 −2
Original line number Diff line number Diff line
@@ -3,7 +3,16 @@ 
# This is not a complete Makefile of itself.  Instead, it is designed to

# be easily embeddable into other systems of Makefiles.

#

DTC_SRCS = dtc.c flattree.c fstree.c data.c livetree.c treesource.c srcpos.c \

	checks.c

DTC_SRCS = \

	checks.c \

	data.c \

	dtc.c \

	flattree.c \

	fstree.c \

	livetree.c \

	srcpos.c \

	treesource.c \

	util.c



DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c

DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)

scripts/dtc/checks.c

+146 −57
Original line number Diff line number Diff line
@@ -31,12 +31,6 @@ 
#define TRACE(c, fmt, ...)	do { } while (0)

#endif



enum checklevel {

	IGNORE = 0,

	WARN = 1,

	ERROR = 2,

};



enum checkstatus {

	UNCHECKED = 0,

	PREREQ,
@@ -57,14 +51,14 @@ struct check { 
	node_check_fn node_fn;

	prop_check_fn prop_fn;

	void *data;

	enum checklevel level;

	bool warn, error;

	enum checkstatus status;

	int inprogress;

	int num_prereqs;

	struct check **prereq;

};



#define CHECK(nm, tfn, nfn, pfn, d, lvl, ...) \

#define CHECK_ENTRY(nm, tfn, nfn, pfn, d, w, e, ...)	       \

	static struct check *nm##_prereqs[] = { __VA_ARGS__ }; \

	static struct check nm = { \

		.name = #nm, \
@@ -72,20 +66,37 @@ struct check { 
		.node_fn = (nfn), \

		.prop_fn = (pfn), \

		.data = (d), \

		.level = (lvl), \

		.warn = (w), \

		.error = (e), \

		.status = UNCHECKED, \

		.num_prereqs = ARRAY_SIZE(nm##_prereqs), \

		.prereq = nm##_prereqs, \

	};



#define TREE_CHECK(nm, d, lvl, ...) \

	CHECK(nm, check_##nm, NULL, NULL, d, lvl, __VA_ARGS__)

#define NODE_CHECK(nm, d, lvl, ...) \

	CHECK(nm, NULL, check_##nm, NULL, d, lvl, __VA_ARGS__)

#define PROP_CHECK(nm, d, lvl, ...) \

	CHECK(nm, NULL, NULL, check_##nm, d, lvl, __VA_ARGS__)

#define BATCH_CHECK(nm, lvl, ...) \

	CHECK(nm, NULL, NULL, NULL, NULL, lvl, __VA_ARGS__)

#define WARNING(nm, tfn, nfn, pfn, d, ...) \

	CHECK_ENTRY(nm, tfn, nfn, pfn, d, true, false, __VA_ARGS__)

#define ERROR(nm, tfn, nfn, pfn, d, ...) \

	CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, true, __VA_ARGS__)

#define CHECK(nm, tfn, nfn, pfn, d, ...) \

	CHECK_ENTRY(nm, tfn, nfn, pfn, d, false, false, __VA_ARGS__)



#define TREE_WARNING(nm, d, ...) \

	WARNING(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)

#define TREE_ERROR(nm, d, ...) \

	ERROR(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)

#define TREE_CHECK(nm, d, ...) \

	CHECK(nm, check_##nm, NULL, NULL, d, __VA_ARGS__)

#define NODE_WARNING(nm, d, ...) \

	WARNING(nm, NULL, check_##nm, NULL, d,  __VA_ARGS__)

#define NODE_ERROR(nm, d, ...) \

	ERROR(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)

#define NODE_CHECK(nm, d, ...) \

	CHECK(nm, NULL, check_##nm, NULL, d, __VA_ARGS__)

#define PROP_WARNING(nm, d, ...) \

	WARNING(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)

#define PROP_ERROR(nm, d, ...) \

	ERROR(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)

#define PROP_CHECK(nm, d, ...) \

	CHECK(nm, NULL, NULL, check_##nm, d, __VA_ARGS__)



#ifdef __GNUC__

static inline void check_msg(struct check *c, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
@@ -95,14 +106,14 @@ static inline void check_msg(struct check *c, const char *fmt, ...) 
	va_list ap;

	va_start(ap, fmt);



	if ((c->level < WARN) || (c->level <= quiet))

		return; /* Suppress message */



	if ((c->warn && (quiet < 1))

	    || (c->error && (quiet < 2))) {

		fprintf(stderr, "%s (%s): ",

		(c->level == ERROR) ? "ERROR" : "Warning", c->name);

			(c->error) ? "ERROR" : "Warning", c->name);

		vfprintf(stderr, fmt, ap);

		fprintf(stderr, "\n");

	}

}



#define FAIL(c, ...) \

	do { \
@@ -167,7 +178,7 @@ static int run_check(struct check *c, struct node *dt) 


out:

	c->inprogress = 0;

	if ((c->status != PASSED) && (c->level == ERROR))

	if ((c->status != PASSED) && (c->error))

		error = 1;

	return error;

}
@@ -176,6 +187,13 @@ out: 
 * Utility check functions

 */



/* A check which always fails, for testing purposes only */

static inline void check_always_fail(struct check *c, struct node *dt)

{

	FAIL(c, "always_fail check");

}

TREE_CHECK(always_fail, NULL);



static void check_is_string(struct check *c, struct node *root,

			    struct node *node)

{
@@ -190,8 +208,10 @@ static void check_is_string(struct check *c, struct node *root, 
		FAIL(c, "\"%s\" property in %s is not a string",

		     propname, node->fullpath);

}

#define CHECK_IS_STRING(nm, propname, lvl) \

	CHECK(nm, NULL, check_is_string, NULL, (propname), (lvl))

#define WARNING_IF_NOT_STRING(nm, propname) \

	WARNING(nm, NULL, check_is_string, NULL, (propname))

#define ERROR_IF_NOT_STRING(nm, propname) \

	ERROR(nm, NULL, check_is_string, NULL, (propname))



static void check_is_cell(struct check *c, struct node *root,

			  struct node *node)
@@ -207,8 +227,10 @@ static void check_is_cell(struct check *c, struct node *root, 
		FAIL(c, "\"%s\" property in %s is not a single cell",

		     propname, node->fullpath);

}

#define CHECK_IS_CELL(nm, propname, lvl) \

	CHECK(nm, NULL, check_is_cell, NULL, (propname), (lvl))

#define WARNING_IF_NOT_CELL(nm, propname) \

	WARNING(nm, NULL, check_is_cell, NULL, (propname))

#define ERROR_IF_NOT_CELL(nm, propname) \

	ERROR(nm, NULL, check_is_cell, NULL, (propname))



/*

 * Structural check functions
@@ -227,20 +249,24 @@ static void check_duplicate_node_names(struct check *c, struct node *dt, 
				FAIL(c, "Duplicate node name %s",

				     child->fullpath);

}

NODE_CHECK(duplicate_node_names, NULL, ERROR);

NODE_ERROR(duplicate_node_names, NULL);



static void check_duplicate_property_names(struct check *c, struct node *dt,

					   struct node *node)

{

	struct property *prop, *prop2;



	for_each_property(node, prop)

		for (prop2 = prop->next; prop2; prop2 = prop2->next)

	for_each_property(node, prop) {

		for (prop2 = prop->next; prop2; prop2 = prop2->next) {

			if (prop2->deleted)

				continue;

			if (streq(prop->name, prop2->name))

				FAIL(c, "Duplicate property name %s in %s",

				     prop->name, node->fullpath);

		}

NODE_CHECK(duplicate_property_names, NULL, ERROR);

	}

}

NODE_ERROR(duplicate_property_names, NULL);



#define LOWERCASE	"abcdefghijklmnopqrstuvwxyz"

#define UPPERCASE	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -256,7 +282,7 @@ static void check_node_name_chars(struct check *c, struct node *dt, 
		FAIL(c, "Bad character '%c' in node %s",

		     node->name[n], node->fullpath);

}

NODE_CHECK(node_name_chars, PROPNODECHARS "@", ERROR);

NODE_ERROR(node_name_chars, PROPNODECHARS "@");



static void check_node_name_format(struct check *c, struct node *dt,

				   struct node *node)
@@ -265,7 +291,7 @@ static void check_node_name_format(struct check *c, struct node *dt, 
		FAIL(c, "Node %s has multiple '@' characters in name",

		     node->fullpath);

}

NODE_CHECK(node_name_format, NULL, ERROR, &node_name_chars);

NODE_ERROR(node_name_format, NULL, &node_name_chars);



static void check_property_name_chars(struct check *c, struct node *dt,

				      struct node *node, struct property *prop)
@@ -276,7 +302,7 @@ static void check_property_name_chars(struct check *c, struct node *dt, 
		FAIL(c, "Bad character '%c' in property name \"%s\", node %s",

		     prop->name[n], prop->name, node->fullpath);

}

PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR);

PROP_ERROR(property_name_chars, PROPNODECHARS);



#define DESCLABEL_FMT	"%s%s%s%s%s"

#define DESCLABEL_ARGS(node,prop,mark)		\
@@ -331,8 +357,8 @@ static void check_duplicate_label_prop(struct check *c, struct node *dt, 
	for_each_marker_of_type(m, LABEL)

		check_duplicate_label(c, dt, m->ref, node, prop, m);

}

CHECK(duplicate_label, NULL, check_duplicate_label_node,

      check_duplicate_label_prop, NULL, ERROR);

ERROR(duplicate_label, NULL, check_duplicate_label_node,

      check_duplicate_label_prop, NULL);



static void check_explicit_phandles(struct check *c, struct node *root,

				    struct node *node, struct property *prop)
@@ -391,7 +417,7 @@ static void check_explicit_phandles(struct check *c, struct node *root, 


	node->phandle = phandle;

}

PROP_CHECK(explicit_phandles, NULL, ERROR);

PROP_ERROR(explicit_phandles, NULL);



static void check_name_properties(struct check *c, struct node *root,

				  struct node *node)
@@ -420,8 +446,8 @@ static void check_name_properties(struct check *c, struct node *root, 
		free(prop);

	}

}

CHECK_IS_STRING(name_is_string, "name", ERROR);

NODE_CHECK(name_properties, NULL, ERROR, &name_is_string);

ERROR_IF_NOT_STRING(name_is_string, "name");

NODE_ERROR(name_properties, NULL, &name_is_string);



/*

 * Reference fixup functions
@@ -448,7 +474,7 @@ static void fixup_phandle_references(struct check *c, struct node *dt, 
		*((cell_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);

	}

}

CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,

ERROR(phandle_references, NULL, NULL, fixup_phandle_references, NULL,

      &duplicate_node_names, &explicit_phandles);



static void fixup_path_references(struct check *c, struct node *dt,
@@ -473,19 +499,19 @@ static void fixup_path_references(struct check *c, struct node *dt, 
						  strlen(path) + 1);

	}

}

CHECK(path_references, NULL, NULL, fixup_path_references, NULL, ERROR,

ERROR(path_references, NULL, NULL, fixup_path_references, NULL,

      &duplicate_node_names);



/*

 * Semantic checks

 */

CHECK_IS_CELL(address_cells_is_cell, "#address-cells", WARN);

CHECK_IS_CELL(size_cells_is_cell, "#size-cells", WARN);

CHECK_IS_CELL(interrupt_cells_is_cell, "#interrupt-cells", WARN);

WARNING_IF_NOT_CELL(address_cells_is_cell, "#address-cells");

WARNING_IF_NOT_CELL(size_cells_is_cell, "#size-cells");

WARNING_IF_NOT_CELL(interrupt_cells_is_cell, "#interrupt-cells");



CHECK_IS_STRING(device_type_is_string, "device_type", WARN);

CHECK_IS_STRING(model_is_string, "model", WARN);

CHECK_IS_STRING(status_is_string, "status", WARN);

WARNING_IF_NOT_STRING(device_type_is_string, "device_type");

WARNING_IF_NOT_STRING(model_is_string, "model");

WARNING_IF_NOT_STRING(status_is_string, "status");



static void fixup_addr_size_cells(struct check *c, struct node *dt,

				  struct node *node)
@@ -503,7 +529,7 @@ static void fixup_addr_size_cells(struct check *c, struct node *dt, 
	if (prop)

		node->size_cells = propval_cell(prop);

}

CHECK(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL, WARN,

WARNING(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL,

	&address_cells_is_cell, &size_cells_is_cell);



#define node_addr_cells(n) \
@@ -538,7 +564,7 @@ static void check_reg_format(struct check *c, struct node *dt, 
		     "(#address-cells == %d, #size-cells == %d)",

		     node->fullpath, prop->val.len, addr_cells, size_cells);

}

NODE_CHECK(reg_format, NULL, WARN, &addr_size_cells);

NODE_WARNING(reg_format, NULL, &addr_size_cells);



static void check_ranges_format(struct check *c, struct node *dt,

				struct node *node)
@@ -579,7 +605,7 @@ static void check_ranges_format(struct check *c, struct node *dt, 
		     p_addr_cells, c_addr_cells, c_size_cells);

	}

}

NODE_CHECK(ranges_format, NULL, WARN, &addr_size_cells);

NODE_WARNING(ranges_format, NULL, &addr_size_cells);



/*

 * Style checks
@@ -606,7 +632,7 @@ static void check_avoid_default_addr_size(struct check *c, struct node *dt, 
		FAIL(c, "Relying on default #size-cells value for %s",

		     node->fullpath);

}

NODE_CHECK(avoid_default_addr_size, NULL, WARN, &addr_size_cells);

NODE_WARNING(avoid_default_addr_size, NULL, &addr_size_cells);



static void check_obsolete_chosen_interrupt_controller(struct check *c,

						       struct node *dt)
@@ -623,7 +649,7 @@ static void check_obsolete_chosen_interrupt_controller(struct check *c, 
		FAIL(c, "/chosen has obsolete \"interrupt-controller\" "

		     "property");

}

TREE_CHECK(obsolete_chosen_interrupt_controller, NULL, WARN);

TREE_WARNING(obsolete_chosen_interrupt_controller, NULL);



static struct check *check_table[] = {

	&duplicate_node_names, &duplicate_property_names,
@@ -642,8 +668,71 @@ static struct check *check_table[] = { 


	&avoid_default_addr_size,

	&obsolete_chosen_interrupt_controller,



	&always_fail,

};



static void enable_warning_error(struct check *c, bool warn, bool error)

{

	int i;



	/* Raising level, also raise it for prereqs */

	if ((warn && !c->warn) || (error && !c->error))

		for (i = 0; i < c->num_prereqs; i++)

			enable_warning_error(c->prereq[i], warn, error);



	c->warn = c->warn || warn;

	c->error = c->error || error;

}



static void disable_warning_error(struct check *c, bool warn, bool error)

{

	int i;



	/* Lowering level, also lower it for things this is the prereq

	 * for */

	if ((warn && c->warn) || (error && c->error)) {

		for (i = 0; i < ARRAY_SIZE(check_table); i++) {

			struct check *cc = check_table[i];

			int j;



			for (j = 0; j < cc->num_prereqs; j++)

				if (cc->prereq[j] == c)

					disable_warning_error(cc, warn, error);

		}

	}



	c->warn = c->warn && !warn;

	c->error = c->error && !error;

}



void parse_checks_option(bool warn, bool error, const char *optarg)

{

	int i;

	const char *name = optarg;

	bool enable = true;



	if ((strncmp(optarg, "no-", 3) == 0)

	    || (strncmp(optarg, "no_", 3) == 0)) {

		name = optarg + 3;

		enable = false;

	}



	for (i = 0; i < ARRAY_SIZE(check_table); i++) {

		struct check *c = check_table[i];



		if (streq(c->name, name)) {

			if (enable)

				enable_warning_error(c, warn, error);

			else

				disable_warning_error(c, warn, error);

			return;

		}

	}



	die("Unrecognized check name \"%s\"\n", name);

}



void process_checks(int force, struct boot_info *bi)

{

	struct node *dt = bi->dt;
@@ -653,7 +742,7 @@ void process_checks(int force, struct boot_info *bi) 
	for (i = 0; i < ARRAY_SIZE(check_table); i++) {

		struct check *c = check_table[i];



		if (c->level != IGNORE)

		if (c->warn || c->error)

			error = error || run_check(c, dt);

	}

scripts/dtc/data.c

+36 −88
Original line number Diff line number Diff line
@@ -68,40 +68,6 @@ struct data data_copy_mem(const char *mem, int len) 
	return d;

}



static char get_oct_char(const char *s, int *i)

{

	char x[4];

	char *endx;

	long val;



	x[3] = '\0';

	strncpy(x, s + *i, 3);



	val = strtol(x, &endx, 8);



	assert(endx > x);



	(*i) += endx - x;

	return val;

}



static char get_hex_char(const char *s, int *i)

{

	char x[3];

	char *endx;

	long val;



	x[2] = '\0';

	strncpy(x, s + *i, 2);



	val = strtol(x, &endx, 16);

	if (!(endx  > x))

		die("\\x used with no following hex digits\n");



	(*i) += endx - x;

	return val;

}



struct data data_copy_escape_string(const char *s, int len)

{

	int i = 0;
@@ -114,54 +80,11 @@ struct data data_copy_escape_string(const char *s, int len) 
	while (i < len) {

		char c = s[i++];



		if (c != '\\') {

			q[d.len++] = c;

			continue;

		}

		if (c == '\\')

			c = get_escape_char(s, &i);



		c = s[i++];

		assert(c);

		switch (c) {

		case 'a':

			q[d.len++] = '\a';

			break;

		case 'b':

			q[d.len++] = '\b';

			break;

		case 't':

			q[d.len++] = '\t';

			break;

		case 'n':

			q[d.len++] = '\n';

			break;

		case 'v':

			q[d.len++] = '\v';

			break;

		case 'f':

			q[d.len++] = '\f';

			break;

		case 'r':

			q[d.len++] = '\r';

			break;

		case '0':

		case '1':

		case '2':

		case '3':

		case '4':

		case '5':

		case '6':

		case '7':

			i--; /* need to re-read the first digit as

			      * part of the octal value */

			q[d.len++] = get_oct_char(s, &i);

			break;

		case 'x':

			q[d.len++] = get_hex_char(s, &i);

			break;

		default:

		q[d.len++] = c;

	}

	}



	q[d.len++] = '\0';

	return d;
@@ -245,11 +168,33 @@ struct data data_merge(struct data d1, struct data d2) 
	return d;

}



struct data data_append_cell(struct data d, cell_t word)

struct data data_append_integer(struct data d, uint64_t value, int bits)

{

	cell_t beword = cpu_to_fdt32(word);

	uint8_t value_8;

	uint16_t value_16;

	uint32_t value_32;

	uint64_t value_64;



	switch (bits) {

	case 8:

		value_8 = value;

		return data_append_data(d, &value_8, 1);



	case 16:

		value_16 = cpu_to_fdt16(value);

		return data_append_data(d, &value_16, 2);



	case 32:

		value_32 = cpu_to_fdt32(value);

		return data_append_data(d, &value_32, 4);



	case 64:

		value_64 = cpu_to_fdt64(value);

		return data_append_data(d, &value_64, 8);



	return data_append_data(d, &beword, sizeof(beword));

	default:

		die("Invalid literal size (%d)\n", bits);

	}

}



struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
@@ -262,11 +207,14 @@ struct data data_append_re(struct data d, const struct fdt_reserve_entry *re) 
	return data_append_data(d, &bere, sizeof(bere));

}



struct data data_append_addr(struct data d, uint64_t addr)

struct data data_append_cell(struct data d, cell_t word)

{

	uint64_t beaddr = cpu_to_fdt64(addr);

	return data_append_integer(d, word, sizeof(word) * 8);

}



	return data_append_data(d, &beaddr, sizeof(beaddr));

struct data data_append_addr(struct data d, uint64_t addr)

{

	return data_append_integer(d, addr, sizeof(addr) * 8);

}



struct data data_append_byte(struct data d, uint8_t byte)

scripts/dtc/dtc-lexer.l

+62 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ PROPNODECHAR [a-zA-Z0-9,._+*#?@-] 
PATHCHAR	({PROPNODECHAR}|[/])

LABEL		[a-zA-Z_][a-zA-Z0-9_]*

STRING		\"([^\\"]|\\.)*\"

CHAR_LITERAL	'([^']|\\')*'

WS		[[:space:]]

COMMENT		"/*"([^*]|\*+[^*/])*\*+"/"

LINECOMMENT	"//".*\n
@@ -70,6 +71,27 @@ static int pop_input_file(void); 
			push_input_file(name);

		}



<*>^"#"(line)?{WS}+[0-9]+{WS}+{STRING}({WS}+[0-9]+)? {

			char *line, *tmp, *fn;

			/* skip text before line # */

			line = yytext;

			while (!isdigit(*line))

				line++;

			/* skip digits in line # */

			tmp = line;

			while (!isspace(*tmp))

				tmp++;

			/* "NULL"-terminate line # */

			*tmp = '\0';

			/* start of filename */

			fn = strchr(tmp + 1, '"') + 1;

			/* strip trailing " from filename */

			tmp = strchr(fn, '"');

			*tmp = 0;

			/* -1 since #line is the number of the next line */

			srcpos_set_line(xstrdup(fn), atoi(line) - 1);

		}



<*><<EOF>>		{

			if (!pop_input_file()) {

				yyterminate();
@@ -96,6 +118,26 @@ static int pop_input_file(void); 
			return DT_MEMRESERVE;

		}



<*>"/bits/"	{

			DPRINT("Keyword: /bits/\n");

			BEGIN_DEFAULT();

			return DT_BITS;

		}



<*>"/delete-property/"	{

			DPRINT("Keyword: /delete-property/\n");

			DPRINT("<PROPNODENAME>\n");

			BEGIN(PROPNODENAME);

			return DT_DEL_PROP;

		}



<*>"/delete-node/"	{

			DPRINT("Keyword: /delete-node/\n");

			DPRINT("<PROPNODENAME>\n");

			BEGIN(PROPNODENAME);

			return DT_DEL_NODE;

		}



<*>{LABEL}:	{

			DPRINT("Label: %s\n", yytext);

			yylval.labelref = xstrdup(yytext);
@@ -103,12 +145,19 @@ static int pop_input_file(void); 
			return DT_LABEL;

		}



<V1>[0-9]+|0[xX][0-9a-fA-F]+      {

<V1>([0-9]+|0[xX][0-9a-fA-F]+)(U|L|UL|LL|ULL)? {

			yylval.literal = xstrdup(yytext);

			DPRINT("Literal: '%s'\n", yylval.literal);

			return DT_LITERAL;

		}



<*>{CHAR_LITERAL}	{

			yytext[yyleng-1] = '\0';

			yylval.literal = xstrdup(yytext+1);

			DPRINT("Character literal: %s\n", yylval.literal);

			return DT_CHAR_LITERAL;

		}



<*>\&{LABEL}	{	/* label reference */

			DPRINT("Ref: %s\n", yytext+1);

			yylval.labelref = xstrdup(yytext+1);
@@ -134,9 +183,10 @@ static int pop_input_file(void); 
			return ']';

		}



<PROPNODENAME>{PROPNODECHAR}+ {

<PROPNODENAME>\\?{PROPNODECHAR}+ {

			DPRINT("PropNodeName: %s\n", yytext);

			yylval.propnodename = xstrdup(yytext);

			yylval.propnodename = xstrdup((yytext[0] == '\\') ?

							yytext + 1 : yytext);

			BEGIN_DEFAULT();

			return DT_PROPNODENAME;

		}
@@ -150,6 +200,15 @@ static int pop_input_file(void); 
<*>{COMMENT}+	/* eat C-style comments */

<*>{LINECOMMENT}+ /* eat C++-style comments */



<*>"<<"		{ return DT_LSHIFT; };

<*>">>"		{ return DT_RSHIFT; };

<*>"<="		{ return DT_LE; };

<*>">="		{ return DT_GE; };

<*>"=="		{ return DT_EQ; };

<*>"!="		{ return DT_NE; };

<*>"&&"		{ return DT_AND; };

<*>"||"		{ return DT_OR; };



<*>.		{

			DPRINT("Char: %c (\\x%02x)\n", yytext[0],

				(unsigned)yytext[0]);

scripts/dtc/dtc-lexer.lex.c_shipped

+361 −142

File changed.

Preview size limit exceeded, changes collapsed.