Index: head/usr.bin/dtc/checking.cc =================================================================== --- head/usr.bin/dtc/checking.cc (revision 306805) +++ head/usr.bin/dtc/checking.cc (revision 306806) @@ -1,259 +1,285 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include "checking.hh" #include +using std::string; - namespace dtc { namespace fdt { namespace checking { namespace { + struct deleted_node_checker : public checker + { + deleted_node_checker(const char *name) : checker(name) {} + virtual bool check_node(device_tree *, const node_ptr &n) + { + auto &deleted = n->deleted_child_nodes(); + if (deleted.empty()) + { + return true; + } + bool plural = deleted.size() > 1; + string errmsg("Attempts to delete "); + errmsg += plural ? "nodes" : "node"; + errmsg += " that "; + errmsg += plural ? "were" : "was"; + errmsg += " not added in merge: "; + for (auto &d : deleted) + { + errmsg += d; + } + report_error(errmsg.c_str()); + return false; + } + }; /** * Checker that verifies that every node that has children has * #address-cells and #size-cells properties. */ struct address_cells_checker : public checker { address_cells_checker(const char *name) : checker(name) {} virtual bool check_node(device_tree *, const node_ptr &n) { // If this has no children, it trivially meets the // conditions. if (n->child_begin() == n->child_end()) { return true; } bool found_address = false; bool found_size = false; for (auto i=n->property_begin(), e=n->property_end() ; i!=e ; ++i) { if (!found_address) { found_address = ((*i)->get_key() == "#address-cells"); } if (!found_size) { found_size = ((*i)->get_key() == "#size-cells"); } if (found_size && found_address) { - break; + break; } } if (!found_address) { - report_error("Missing #address-cells property"); + report_error("Missing #address-cells property"); } if (!found_size) { - report_error("Missing #size-cells property"); + report_error("Missing #size-cells property"); } return found_address && found_size; } }; } // anonymous namespace bool checker::visit_node(device_tree *tree, const node_ptr &n) { path.push_back(std::make_pair(n->name, n->unit_address)); // Check this node if (!check_node(tree, n)) { return false; } // Now check its properties for (auto i=n->property_begin(), e=n->property_end() ; i!=e ; ++i) { if (!check_property(tree, n, *i)) { return false; } } // And then recursively check the children for (node::child_iterator i=n->child_begin(), e=n->child_end() ; i!=e ; ++i) { if (!visit_node(tree, *i)) { return false; } } path.pop_back(); return true; } void checker::report_error(const char *errmsg) { fprintf(stderr, "Error: %s, while checking node: ", errmsg); for (auto &p : path) { putc('/', stderr); - p.first.dump(); + puts(p.first.c_str()); if (!(p.second.empty())) { putc('@', stderr); - p.second.dump(); + puts(p.second.c_str()); } } fprintf(stderr, " [-W%s]\n", checker_name); } bool property_checker::check_property(device_tree *tree, const node_ptr &n, property_ptr p) { if (p->get_key() == key) { if (!check(tree, n, p)) { report_error("property check failed"); return false; } } return true; } bool property_size_checker::check(device_tree *, const node_ptr &, property_ptr p) { uint32_t psize = 0; for (property::value_iterator i=p->begin(),e=p->end() ; i!=e ; ++i) { if (!i->is_binary()) { return false; } psize += i->byte_data.size(); } return psize == size; } template void -check_manager::add_property_type_checker(const char *name, string prop) +check_manager::add_property_type_checker(const char *name, const string &prop) { checkers.insert(std::make_pair(string(name), new property_type_checker(name, prop))); } void check_manager::add_property_size_checker(const char *name, - string prop, + const string &prop, uint32_t size) { checkers.insert(std::make_pair(string(name), new property_size_checker(name, prop, size))); } check_manager::~check_manager() { while (checkers.begin() != checkers.end()) { delete checkers.begin()->second; checkers.erase(checkers.begin()); } while (disabled_checkers.begin() != disabled_checkers.end()) { delete disabled_checkers.begin()->second; disabled_checkers.erase(disabled_checkers.begin()); } } check_manager::check_manager() { // NOTE: All checks listed here MUST have a corresponding line // in the man page! add_property_type_checker( "type-compatible", string("compatible")); add_property_type_checker( "type-model", string("model")); add_property_size_checker("type-phandle", string("phandle"), 4); disabled_checkers.insert(std::make_pair(string("cells-attributes"), new address_cells_checker("cells-attributes"))); + checkers.insert(std::make_pair(string("deleted-nodes"), + new deleted_node_checker("deleted-nodes"))); } bool check_manager::run_checks(device_tree *tree, bool keep_going) { bool success = true; for (auto &i : checkers) { success &= i.second->check_tree(tree); if (!(success || keep_going)) { break; } } return success; } bool -check_manager::disable_checker(string name) +check_manager::disable_checker(const string &name) { auto checker = checkers.find(name); if (checker != checkers.end()) { disabled_checkers.insert(std::make_pair(name, checker->second)); checkers.erase(checker); return true; } return false; } bool -check_manager::enable_checker(string name) +check_manager::enable_checker(const string &name) { auto checker = disabled_checkers.find(name); if (checker != disabled_checkers.end()) { checkers.insert(std::make_pair(name, checker->second)); disabled_checkers.erase(checker); return true; } return false; } } // namespace checking } // namespace fdt } // namespace dtc Index: head/usr.bin/dtc/checking.hh =================================================================== --- head/usr.bin/dtc/checking.hh (revision 306805) +++ head/usr.bin/dtc/checking.hh (revision 306806) @@ -1,308 +1,310 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _CHECKING_HH_ #define _CHECKING_HH_ -#include "string.hh" +#include #include "fdt.hh" namespace dtc { namespace fdt { namespace checking { /** * Base class for all checkers. This will visit the entire tree and perform * semantic checks defined in subclasses. Note that device trees are generally * small (a few dozen nodes at most) and so we optimise for flexibility and * extensibility here, not for performance. Each checker will visit the entire * tree. */ class checker { /** * The path to the current node being checked. This is used for * printing error messages. */ device_tree::node_path path; /** * The name of the checker. This is used for printing error messages * and for enabling / disabling specific checkers from the command - * line. + * line. */ const char *checker_name; /** * Visits each node, calling the checker functions on properties and * nodes. */ bool visit_node(device_tree *tree, const node_ptr &n); protected: /** * Prints the error message, along with the path to the node that * caused the error and the name of the checker. */ void report_error(const char *errmsg); public: /** * Constructor. Takes the name of this checker, which is which is used * when reporting errors. */ checker(const char *name) : checker_name(name) {} /** * Virtual destructor in case any subclasses need to do cleanup. */ virtual ~checker() {} /** * Method for checking that a node is valid. The root class version * does nothing, subclasses should override this. */ virtual bool check_node(device_tree *, const node_ptr &) { return true; } /** * Method for checking that a property is valid. The root class * version does nothing, subclasses should override this. */ virtual bool check_property(device_tree *, const node_ptr &, property_ptr ) { return true; } /** * Runs the checker on the specified device tree. */ bool check_tree(fdt::device_tree *tree) { return visit_node(tree, tree->get_root()); } }; /** * Abstract base class for simple property checks. This class defines a check * method for subclasses, which is invoked only when it finds a property with * the matching name. To define simple property checkers, just subclass this * and override the check() method. */ class property_checker : public checker { /** * The name of the property that this checker is looking for. */ - string key; + std::string key; public: /** * Implementation of the generic property-checking method that checks - * for a property with the name specified in the constructor + * for a property with the name specified in the constructor. */ virtual bool check_property(device_tree *tree, const node_ptr &n, property_ptr p); /** * Constructor. Takes the name of the checker and the name of the * property to check. */ - property_checker(const char* name, string property_name) + property_checker(const char* name, const std::string &property_name) : checker(name), key(property_name) {} /** * The check method, which subclasses should implement. */ virtual bool check(device_tree *tree, const node_ptr &n, property_ptr p) = 0; }; /** * Property type checker. */ template struct property_type_checker : public property_checker { /** * Constructor, takes the name of the checker and the name of the * property to check as arguments. */ - property_type_checker(const char* name, string property_name) : + property_type_checker(const char* name, const std::string &property_name) : property_checker(name, property_name) {} virtual bool check(device_tree *tree, const node_ptr &n, property_ptr p) = 0; }; /** * Empty property checker. This checks that the property has no value. */ template<> struct property_type_checker : public property_checker { - property_type_checker(const char* name, string property_name) : + property_type_checker(const char* name, const std::string &property_name) : property_checker(name, property_name) {} virtual bool check(device_tree *, const node_ptr &, property_ptr p) { return p->begin() == p->end(); } }; /** * String property checker. This checks that the property has exactly one * value, which is a string. */ template<> struct property_type_checker : public property_checker { - property_type_checker(const char* name, string property_name) : + property_type_checker(const char* name, const std::string &property_name) : property_checker(name, property_name) {} virtual bool check(device_tree *, const node_ptr &, property_ptr p) { return (p->begin() + 1 == p->end()) && p->begin()->is_string(); } }; /** * String list property checker. This checks that the property has at least * one value, all of which are strings. */ template<> struct property_type_checker : public property_checker { - property_type_checker(const char* name, string property_name) : + property_type_checker(const char* name, const std::string &property_name) : property_checker(name, property_name) {} virtual bool check(device_tree *, const node_ptr &, property_ptr p) { for (property::value_iterator i=p->begin(),e=p->end() ; i!=e ; ++i) { if (!(i->is_string() || i->is_string_list())) { return false; } } return p->begin() != p->end(); } }; /** * Phandle property checker. This checks that the property has exactly one * value, which is a valid phandle. */ template<> struct property_type_checker : public property_checker { - property_type_checker(const char* name, string property_name) : + property_type_checker(const char* name, const std::string &property_name) : property_checker(name, property_name) {} virtual bool check(device_tree *tree, const node_ptr &, property_ptr p) { - return (p->begin() + 1 == p->end()) && + return (p->begin() + 1 == p->end()) && (tree->referenced_node(*p->begin()) != 0); } }; /** * Check that a property has the correct size. */ struct property_size_checker : public property_checker { /** * The expected size of the property. */ uint32_t size; public: /** * Constructor, takes the name of the checker, the name of the property * to check, and its expected size as arguments. */ - property_size_checker(const char* name, string property_name, uint32_t bytes) + property_size_checker(const char* name, + const std::string &property_name, + uint32_t bytes) : property_checker(name, property_name), size(bytes) {} /** * Check, validates that the property has the correct size. */ virtual bool check(device_tree *tree, const node_ptr &n, property_ptr p); }; /** * The check manager is the interface to running the checks. This allows * default checks to be enabled, non-default checks to be enabled, and so on. */ class check_manager { /** * The enabled checkers, indexed by their names. The name is used when * disabling checkers from the command line. When this manager runs, * it will only run the checkers from this map. */ - std::unordered_map checkers; + std::unordered_map checkers; /** * The disabled checkers. Moving checkers to this list disables them, * but allows them to be easily moved back. */ - std::unordered_map disabled_checkers; + std::unordered_map disabled_checkers; /** * Helper function for adding a property value checker. */ template - void add_property_type_checker(const char *name, string prop); + void add_property_type_checker(const char *name, const std::string &prop); /** * Helper function for adding a simple type checker. */ - void add_property_type_checker(const char *name, string prop); + void add_property_type_checker(const char *name, const std::string &prop); /** * Helper function for adding a property value checker. */ void add_property_size_checker(const char *name, - string prop, + const std::string &prop, uint32_t size); public: /** * Delete all of the checkers that are part of this checker manager. */ ~check_manager(); /** * Default constructor, creates check manager containing all of the * default checks. */ check_manager(); /** * Run all of the checks on the specified tree. */ bool run_checks(device_tree *tree, bool keep_going); /** * Disables the named checker. */ - bool disable_checker(string name); + bool disable_checker(const std::string &name); /** - * Enables the named checker. + * Enables the named checker. */ - bool enable_checker(string name); + bool enable_checker(const std::string &name); }; } // namespace checking } // namespace fdt } // namespace dtc #endif // !_CHECKING_HH_ Index: head/usr.bin/dtc/dtb.cc =================================================================== --- head/usr.bin/dtc/dtb.cc (revision 306805) +++ head/usr.bin/dtc/dtb.cc (revision 306806) @@ -1,311 +1,313 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include "dtb.hh" #include #include #include #include +using std::string; namespace dtc { namespace dtb { void output_writer::write_data(byte_buffer b) { for (auto i : b) { write_data(i); } } void -binary_writer::write_string(string name) +binary_writer::write_string(const string &name) { - name.push_to_buffer(buffer); + push_string(buffer, name); // Trailing nul buffer.push_back(0); } void binary_writer::write_data(uint8_t v) { buffer.push_back(v); } void binary_writer::write_data(uint32_t v) { while (buffer.size() % 4 != 0) { buffer.push_back(0); } push_big_endian(buffer, v); } void binary_writer::write_data(uint64_t v) { while (buffer.size() % 8 != 0) { buffer.push_back(0); } push_big_endian(buffer, v); } void binary_writer::write_to_file(int fd) { // FIXME: Check return write(fd, buffer.data(), buffer.size()); } uint32_t binary_writer::size() { return buffer.size(); } void -asm_writer::write_string(const char *c) -{ - while (*c) - { - buffer.push_back((uint8_t)*(c++)); - } -} - -void asm_writer::write_line(const char *c) { if (byte_count != 0) { byte_count = 0; buffer.push_back('\n'); } write_string(c); } void asm_writer::write_byte(uint8_t b) { char out[3] = {0}; if (byte_count++ == 0) { buffer.push_back('\t'); } write_string(".byte 0x"); snprintf(out, 3, "%.2hhx", b); buffer.push_back(out[0]); buffer.push_back(out[1]); if (byte_count == 4) { buffer.push_back('\n'); byte_count = 0; } else { buffer.push_back(';'); buffer.push_back(' '); } } void -asm_writer::write_label(string name) +asm_writer::write_label(const string &name) { write_line("\t.globl "); - name.push_to_buffer(buffer); + push_string(buffer, name); buffer.push_back('\n'); - name.push_to_buffer(buffer); + push_string(buffer, name); buffer.push_back(':'); buffer.push_back('\n'); buffer.push_back('_'); - name.push_to_buffer(buffer); + push_string(buffer, name); buffer.push_back(':'); buffer.push_back('\n'); } void -asm_writer::write_comment(string name) +asm_writer::write_comment(const string &name) { write_line("\t/* "); - name.push_to_buffer(buffer); + push_string(buffer, name); write_string(" */\n"); } void -asm_writer::write_string(string name) +asm_writer::write_string(const char *c) { + while (*c) + { + buffer.push_back((uint8_t)*(c++)); + } +} + + +void +asm_writer::write_string(const string &name) +{ write_line("\t.string \""); - name.push_to_buffer(buffer); + push_string(buffer, name); write_line("\"\n"); bytes_written += name.size() + 1; } void asm_writer::write_data(uint8_t v) { write_byte(v); bytes_written++; } void asm_writer::write_data(uint32_t v) { if (bytes_written % 4 != 0) { write_line("\t.balign 4\n"); bytes_written += (4 - (bytes_written % 4)); } write_byte((v >> 24) & 0xff); write_byte((v >> 16) & 0xff); write_byte((v >> 8) & 0xff); write_byte((v >> 0) & 0xff); bytes_written += 4; } void asm_writer::write_data(uint64_t v) { if (bytes_written % 8 != 0) { write_line("\t.balign 8\n"); bytes_written += (8 - (bytes_written % 8)); } write_byte((v >> 56) & 0xff); write_byte((v >> 48) & 0xff); write_byte((v >> 40) & 0xff); write_byte((v >> 32) & 0xff); write_byte((v >> 24) & 0xff); write_byte((v >> 16) & 0xff); write_byte((v >> 8) & 0xff); write_byte((v >> 0) & 0xff); bytes_written += 8; } void asm_writer::write_to_file(int fd) { // FIXME: Check return write(fd, buffer.data(), buffer.size()); } uint32_t asm_writer::size() { return bytes_written; } void header::write(output_writer &out) { - out.write_label(string("dt_blob_start")); - out.write_label(string("dt_header")); + out.write_label("dt_blob_start"); + out.write_label("dt_header"); out.write_comment("magic"); out.write_data(magic); out.write_comment("totalsize"); out.write_data(totalsize); out.write_comment("off_dt_struct"); out.write_data(off_dt_struct); out.write_comment("off_dt_strings"); out.write_data(off_dt_strings); out.write_comment("off_mem_rsvmap"); out.write_data(off_mem_rsvmap); out.write_comment("version"); out.write_data(version); out.write_comment("last_comp_version"); out.write_data(last_comp_version); out.write_comment("boot_cpuid_phys"); out.write_data(boot_cpuid_phys); out.write_comment("size_dt_strings"); out.write_data(size_dt_strings); out.write_comment("size_dt_struct"); out.write_data(size_dt_struct); } bool header::read_dtb(input_buffer &input) { if (!(input.consume_binary(magic) && magic == 0xd00dfeed)) { fprintf(stderr, "Missing magic token in header. Got %" PRIx32 " expected 0xd00dfeed\n", magic); return false; } return input.consume_binary(totalsize) && input.consume_binary(off_dt_struct) && input.consume_binary(off_dt_strings) && input.consume_binary(off_mem_rsvmap) && input.consume_binary(version) && input.consume_binary(last_comp_version) && input.consume_binary(boot_cpuid_phys) && input.consume_binary(size_dt_strings) && input.consume_binary(size_dt_struct); } uint32_t -string_table::add_string(string str) +string_table::add_string(const string &str) { auto old = string_offsets.find(str); if (old == string_offsets.end()) { uint32_t start = size; // Don't forget the trailing nul size += str.size() + 1; string_offsets.insert(std::make_pair(str, start)); strings.push_back(str); return start; } else { return old->second; } } void string_table::write(dtb::output_writer &writer) { - writer.write_comment(string("Strings table.")); - writer.write_label(string("dt_strings_start")); + writer.write_comment("Strings table."); + writer.write_label("dt_strings_start"); for (auto &i : strings) { writer.write_string(i); } - writer.write_label(string("dt_strings_end")); + writer.write_label("dt_strings_end"); } } // namespace dtb } // namespace dtc Index: head/usr.bin/dtc/dtb.hh =================================================================== --- head/usr.bin/dtc/dtb.hh (revision 306805) +++ head/usr.bin/dtc/dtb.hh (revision 306806) @@ -1,365 +1,371 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _DTB_HH_ #define _DTB_HH_ #include -#include "string.hh" +#include #include +#include "input_buffer.hh" +#include "util.hh" + namespace dtc { /** * The dtb namespace contains code related to the generation of device tree * blobs, the binary representation of flattened device trees. The abstract * tree representation calls into this code to generate the output. */ namespace dtb { /** The token types in the DTB, as defined by ยง7.4.1 of the ePAPR * specification. All of these values are written in big-endian format in the * output. */ enum token_type { /** * Marker indicating the start of a node in the tree. This is followed * by the nul-terminated name. If a unit address is specified, then * the name also contains the address, with an @ symbol between the end * of the name and the start of the address. * * The name is then padded such that the next token begins on a 4-byte * boundary. The node may contain properties, other nodes, both, or be * empty. */ FDT_BEGIN_NODE = 0x00000001, /** * Marker indicating the end of a node. */ FDT_END_NODE = 0x00000002, /** * The start of a property. This is followed by two 32-bit big-endian * values. The first indicates the length of the property value, the * second its index in the strings table. It is then followed by the * property value, if the value is of non-zero length. */ FDT_PROP = 0x00000003, /** * Ignored token. May be used for padding inside DTB nodes. */ FDT_NOP = 0x00000004, /** * Marker indicating the end of the tree. */ FDT_END = 0x00000009 }; /** * Returns the token as a string. This is used for debugging and for printing * human-friendly error messages about malformed DTB input. */ inline const char *token_type_name(token_type t) { switch(t) { case FDT_BEGIN_NODE: return "FDT_BEGIN_NODE"; case FDT_END_NODE: return "FDT_END_NODE"; case FDT_PROP: return "FDT_PROP"; case FDT_NOP: return "FDT_NOP"; case FDT_END: return "FDT_END"; } assert(0); } /** * Abstract class for writing a section of the output. We create one * of these for each section that needs to be written. It is intended to build * a temporary buffer of the output in memory and then write it to a file * stream. The size can be returned after all of the data has been written * into the internal buffer, so the sizes of the three tables can be calculated * before storing them in the buffer. */ struct output_writer { /** * Writes a label into the output stream. This is only applicable for * assembly output, where the labels become symbols that can be * resolved at link time. */ - virtual void write_label(string name) = 0; + virtual void write_label(const std::string &name) = 0; /** * Writes a comment into the output stream. Useful only when debugging * the output. */ - virtual void write_comment(string name) = 0; + virtual void write_comment(const std::string &name) = 0; /** * Writes a string. A nul terminator is implicitly added. */ - virtual void write_string(string name) = 0; + virtual void write_string(const std::string &name) = 0; /** * Writes a single 8-bit value. */ virtual void write_data(uint8_t) = 0; /** * Writes a single 32-bit value. The value is written in big-endian * format, but should be passed in the host's native endian. */ virtual void write_data(uint32_t) = 0; /** * Writes a single 64-bit value. The value is written in big-endian * format, but should be passed in the host's native endian. */ virtual void write_data(uint64_t) = 0; /** * Writes the collected output to the specified file descriptor. */ virtual void write_to_file(int fd) = 0; /** * Returns the number of bytes. */ virtual uint32_t size() = 0; /** * Helper for writing tokens to the output stream. This writes a * comment above the token describing its value, for easier debugging * of the output. */ inline void write_token(token_type t) { write_comment(token_type_name(t)); write_data((uint32_t)t); } /** * Helper function that writes a byte buffer to the output, one byte at * a time. */ void write_data(byte_buffer b); }; /** * Binary file writer. This class is responsible for writing the DTB output * directly in blob format. */ class binary_writer : public output_writer { /** * The internal buffer used to store the blob while it is being * constructed. */ byte_buffer buffer; public: /** * The binary format does not support labels, so this method * does nothing. */ - virtual void write_label(string) {} + virtual void write_label(const std::string &) {} /** * Comments are ignored by the binary writer. */ - virtual void write_comment(string) {} - virtual void write_string(string name); + virtual void write_comment(const std::string&) {} + virtual void write_string(const std::string &name); virtual void write_data(uint8_t v); virtual void write_data(uint32_t v); virtual void write_data(uint64_t v); virtual void write_to_file(int fd); virtual uint32_t size(); }; /** * Assembly writer. This class is responsible for writing the output in an * assembly format that is suitable for linking into a kernel, loader, and so * on. */ class asm_writer : public output_writer { /** * The internal buffer for temporary values. Note that this actually * contains ASCII text, but it is a byte buffer so that we can just * copy strings across as-is. */ byte_buffer buffer; /** * The number of bytes written to the current line. This is used to * allow line wrapping, where we aim to write four .byte directives to * make the alignment clearer. */ int byte_count; /** * The current number of bytes written. This is the number in binary * format, not the number of bytes in the buffer. */ uint32_t bytes_written; /** - * Writes a C string directly to the output as-is. This is mainly used - * for writing directives. + * Writes a string directly to the output as-is. This is the function that + * performs the real output. */ void write_string(const char *c); /** + * Write a string to the output. + */ + void write_string(const std::string &c); + /** * Writes the string, starting on a new line. */ void write_line(const char *c); /** * Writes a byte in binary format. This will emit a single .byte * directive, with up to four per line. */ void write_byte(uint8_t b); public: asm_writer() : byte_count(0), bytes_written(0) {} - virtual void write_label(string name); - virtual void write_comment(string name); - virtual void write_string(string name); + virtual void write_label(const std::string &name); + virtual void write_comment(const std::string &name); virtual void write_data(uint8_t v); virtual void write_data(uint32_t v); virtual void write_data(uint64_t v); virtual void write_to_file(int fd); virtual uint32_t size(); }; /** * Class encapsulating the device tree blob header. This class stores all of * the values found in the header and is responsible for writing them to the * output. */ struct header { /** * Magic value, used to validate that this really is a device tree * blob. Should always be set to 0xd00dfeed. */ uint32_t magic; /** * The total size of the blob, including header, reservations, strings * table, and padding. */ uint32_t totalsize; /** * The offset from the start of the blob of the struct table (i.e. the * part of the blob containing the entire device tree). */ uint32_t off_dt_struct; /** * The offset from the start of the blob of the strings table. */ uint32_t off_dt_strings; /** * The offset of the reservation map from the start of the blob. */ uint32_t off_mem_rsvmap; /** * The version of the blob. This should always be 17. */ uint32_t version; /** * The earliest version of the DTB specification with which this blob * is backwards compatible. This should always be 16. */ uint32_t last_comp_version; /** * The ID of the CPU where this boots. */ uint32_t boot_cpuid_phys; /** * The size of the strings table. */ uint32_t size_dt_strings; /** * The size of the struct table. */ uint32_t size_dt_struct; /** * Writes the entire header to the specified output buffer. */ void write(output_writer &out); /** * Reads the header from bits binary representation in a blob. */ bool read_dtb(input_buffer &input); /** * Default constructor. Initialises the values that have sensible * defaults, leaves the others blank. */ header() : magic(0xd00dfeed), version(17), last_comp_version(16), boot_cpuid_phys(0) {} }; /** * Class encapsulating the string table. FDT strings are stored in a string * section. This maintains a map from strings to their offsets in the strings * section. * * Note: We don't currently do suffix matching, which may save a small amount * of space. */ class string_table { /** * Map from strings to their offset. */ - std::map string_offsets; + std::map string_offsets; /** * The strings, in the order in which they should be written to the * output. The order must be stable - adding another string must not * change the offset of any that we have already referenced - and so we * simply write the strings in the order that they are passed. */ - std::vector strings; + std::vector strings; /** * The current size of the strings section. */ uint32_t size; public: /** * Default constructor, creates an empty strings table. */ string_table() : size(0) {} /** * Adds a string to the table, returning the offset from the start * where it will be written. If the string is already present, this * will return its existing offset, otherwise it will return a new * offset. */ - uint32_t add_string(string str); + uint32_t add_string(const std::string &str); /** * Writes the strings table to the specified output. */ void write(dtb::output_writer &writer); }; } // namespace dtb } // namespace dtc #endif // !_DTB_HH_ Index: head/usr.bin/dtc/dtc.1 =================================================================== --- head/usr.bin/dtc/dtc.1 (revision 306805) +++ head/usr.bin/dtc/dtc.1 (revision 306806) @@ -1,332 +1,336 @@ .\"- .\" Copyright (c) 2013 David Chisnall .\" All rights reserved. .\" .\" This software was developed by SRI International and the University of .\" Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) .\" ("CTSRD"), as part of the DARPA CRASH research programme. .\" .\" This software was developed by SRI International and the University of .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" .\" $FreeBSD$ .\"/ .Dd January 1, 2013 .Dt DTC 1 .Os .Sh NAME .Nm dtc .Nd device tree compiler .Sh SYNOPSIS .Nm .Op Fl fhsv .Op Fl b Ar boot_cpu_id .Op Fl d Ar dependency_file .Op Fl E Ar [no-]checker_name .Op Fl H Ar phandle_format .Op Fl I Ar input_format .Op Fl O Ar output_format .Op Fl o Ar output_file .Op Fl R Ar entries .Op Fl S Ar bytes .Op Fl p Ar bytes .Op Fl V Ar blob_version .Op Fl W Ar [no-]checker_name .Op Fl P Ar predefined_properties .Ar input_file .Sh DESCRIPTION The .Nm utility converts flattened device tree (FDT) representations. It is most commonly used to generate device tree blobs (DTB), the binary representation of an FDT, from device tree sources (DTS), the ASCII text source representation. .Pp The binary can be written in two formats, binary and assembly. The binary is identical to the in-memory representation and can be used directly by firmware, loaders, and so on. The assembly format, documented in .Sx "ASM FORMAT" , will produce the same binary format when assembled, but also includes some global variables that refer to parts of the table. This format is most commonly used to produce a kernel specific to a device, with the device tree blob compiled in. .Pp The options are as follows: .Bl -tag -width indent .It Fl d Ar dependency_file Writes a dependency file understandable by make to the specified file. This file can be included in a Makefile and will ensure that the output file depends on the input file and any files that it includes. This argument is only useful when the input is DTS, as only the source format has a notion of inclusions. .It Fl E Ar [no-]checker_name Enable or disable a specified checker. The argument is the name of the checker. The full list of checkers is given in .Sx CHECKERS . .It Fl f Force the tool to attempt to generate the output, even if the input had errors. .It Fl h Display the help text and exit. .It Fl H Ar phandle_format Specifies the type of phandle nodes to generate in the output. Valid values are: .Pp .Bl -tag -width indent -compact .It Ar linux Generate the legacy linux,phandle nodes expected by older systems. .It Ar epapr Generate the phandle nodes, as described in the ePAPR specification. This is the most sensible option for device trees being used with .Fx . .It Ar both Generate both, for maximum compatibility. .El .It Fl I Ar input_format Specifies the input format. Valid values are: .Pp .Bl -tag -width indent -compact .It Ar dtb Device tree blob. The binary representation of the FDT. .It Ar dts Device tree source. The ASCII representation of the FDT. This is the default if the input format is not explicitly stated. .El .It Fl O Ar output_format Specifies the output format. Valid values are: .Pp .Bl -tag -width indent -compact .It Ar asm Assembler source for generating a device tree blob, as described in .Sx "ASM FORMAT" . .It Ar dtb Device tree blob. The binary representation of the FDT. This is the default if the output format is not explicitly stated. .It Ar dts Device tree source. The ASCII representation of the FDT. .El .It Fl o Ar output_file The file to which to write the output. .It Fl P Ar predefined_macro Defines a macro, in the form .Ar name=value or .Ar name to be used for device tree source files that contain conditional components. This tool supports two extensions to the standard to support conditional compilation of device trees. The first is an .Ar /include/if [property]/ "file.dts" directive that is allowed at the start of a file and which will only include the specified file if it the specified property is passed with this flag. The second is the .Ar $NAME format for property values. These allow property value to be specified on the command line. .It Fl R Ar entries The number of empty reservation table entries to pad the table with. This is useful if you are generating a device tree blob for bootloader or similar that needs to reserve some memory before passing control to the operating system. .It Fl S Ar bytes The minimum size in bytes of the blob. The blob will be padded after the strings table to ensure that it is the correct size. This is useful for environments where the device tree blob must be modified in place. .It Fl p Ar bytes The number of bytes of padding to add to the blob. The blob will be padded after the strings table to ensure that it is the correct size. This is useful for environments where the device tree blob must be modified in place. .It Fl W Ar [no-]checker_name Enable or disable a specified checker. This is an alias for .Fl E . .It Fl s Sorts the properties and nodes in the tree. This is mainly useful when using tools like .Xr diff 1 to compare two device tree sources. .It Fl V Ar output_version The version of the format to output. This is only relevant for binary outputs, and only a value of 17 is currently supported. .It Fl v Display the tool version and exit. .It Ar input_file The source file. .El .Sh "ASM FORMAT" The assembly format defines several globals that can be referred to from other compilation units, in addition to any labels specified in the source. These are: .Pp .Bl -tag -width "dt_strings_start" -compact -offset indent .It dt_blob_start start of the device tree blob. .It dt_header start of the header, usually identical to the start of the blob. .It dt_reserve_map start of the reservation map. .It dt_struct_start start of the structure table. .It dt_struct_end end of the structure table. .It dt_strings_start start of the strings table. .It dt_strings_end end of the strings table. .It dt_blob_end end of the device tree blob. .El .Sh CHECKERS The utility provides a number of semantic checks on the correctness of the tree. These can be disabled with the .Fl W flag. For example, .Fl W Ar no-type-phandle will disable the phandle type check. The supported checks are: .Pp .Bl -tag -width "no-type-phandle" -compact -offset indent .It type-compatible Checks the type of the .Va compatible property. .It type-model Checks the type of the .Va model property. .It type-compatible Checks the type of the .Va compatible property. .It cells-attributes Checks that all nodes with children have both .Va #address-cells and .Va #size-cells properties. +.It deleted-nodes +Checks that all +.Va /delete-node/ +statements refer to nodes that are merged. .El .Sh EXAMPLES The command: .Pp .Dl "dtc -o blob.S -O asm device.dts" .Pp will generate a .Pa blob.S file from the device tree source .Pa device.dts and print errors if any occur during parsing or property checking. The resulting file can be assembled and linked into a binary. .Pp The command: .Pp .Dl "dtc -o - -O dts -I dtb device.dtb" .Pp will write the device tree source for the device tree blob .Pa device.dtb to the standard output. This is useful when debugging device trees. .Sh COMPATIBILITY This utility is intended to be compatible with the device tree compiler provided by elinux.org. Currently, it implements the subset of features required to build FreeBSD and others that have been requested by FreeBSD developers. .Pp The .Ar fs input format is not supported. This builds a tree from a Linux .Pa /proc/device-tree , a file system hierarchy not found in FreeBSD, which instead exposes the DTB directly via a sysctl. .Pp The warnings and errors supported by the elinux.org tool are not documented. This tool supports the warnings described in the .Sx CHECKERS section. .Sh SEE ALSO .Xr fdt 4 .Sh STANDARDS The device tree formats understood by this tool conform to the Power.org Standard for Embedded Power Architecture Platform Requirements .Pq Vt ePAPR , except as noted in the .Sx BUGS section and with the following exceptions for compatibility with the elinux.org tool: .Pp .Bl -bullet -compact .It The target of cross references is defined to be a node name in the specification, but is in fact a label. .El .Pp The /include/ directive is not part of the standard, however it is implemented with the semantics compatible with the elinux.org tool. It must appear in the top level of a file, and imports a new root definition. If a file, plus all of its inclusions, contains multiple roots then they are merged. All nodes that are present in the second but not the first are imported. Any that appear in both are recursively merged, with properties from the second replacing those from the first and properties child nodes being recursively merged. .Sh HISTORY A dtc tool first appeared in .Fx 9.0 . This version of the tool first appeared in .Fx 10.0 . .Sh AUTHORS .An David T. Chisnall .Pp Note: The fact that the tool and the author share the same initials is entirely coincidental. .Sh BUGS The device tree compiler does not yet support the following features: .Pp .Bl -bullet -compact .It Labels in the middle of property values. This is only useful in the assembly output, and only vaguely useful there, so is unlikely to be added soon. .It Full paths, rather than labels, as the targets for phandles. This is not very hard to add, but will probably not be added until something actually needs it. .El .Pp The current version performs a very limited set of semantic checks on the tree. This will be improved in future versions. Index: head/usr.bin/dtc/dtc.cc =================================================================== --- head/usr.bin/dtc/dtc.cc (revision 306805) +++ head/usr.bin/dtc/dtc.cc (revision 306806) @@ -1,344 +1,345 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include "fdt.hh" #include "checking.hh" +#include "util.hh" using namespace dtc; +using std::string; /** * The current major version of the tool. */ int version_major = 0; /** * The current minor version of the tool. */ int version_minor = 4; /** * The current patch level of the tool. */ int version_patch = 0; -static void usage(const char* argv0) +static void usage(const string &argv0) { fprintf(stderr, "Usage:\n" "\t%s\t[-fhsv] [-b boot_cpu_id] [-d dependency_file]" "[-E [no-]checker_name]\n" "\t\t[-H phandle_format] [-I input_format]" "[-O output_format]\n" "\t\t[-o output_file] [-R entries] [-S bytes] [-p bytes]" "[-V blob_version]\n" - "\t\t-W [no-]checker_name] input_file\n", basename((char*)argv0)); + "\t\t-W [no-]checker_name] input_file\n", basename(argv0).c_str()); } /** * Prints the current version of this program.. */ static void version(const char* progname) { fprintf(stderr, "Version: %s %d.%d.%d\n", progname, version_major, version_minor, version_patch); } using fdt::device_tree; int main(int argc, char **argv) { int ch; int outfile = fileno(stdout); const char *outfile_name = "-"; const char *in_file = "-"; FILE *depfile = 0; bool debug_mode = false; - void (device_tree::*write_fn)(int) = &device_tree::write_binary; - void (device_tree::*read_fn)(const char*, FILE*) = - &device_tree::parse_dts; + auto write_fn = &device_tree::write_binary; + auto read_fn = &device_tree::parse_dts; uint32_t boot_cpu; bool boot_cpu_specified = false; bool keep_going = false; bool sort = false; clock_t c0 = clock(); class device_tree tree; fdt::checking::check_manager checks; const char *options = "hqI:O:o:V:d:R:S:p:b:fi:svH:W:E:DP:"; // Don't forget to update the man page if any more options are added. while ((ch = getopt(argc, argv, options)) != -1) { switch (ch) { case 'h': usage(argv[0]); return EXIT_SUCCESS; case 'v': version(argv[0]); return EXIT_SUCCESS; case 'I': { - string arg = string(optarg); - if (arg == string("dtb")) + string arg(optarg); + if (arg == "dtb") { read_fn = &device_tree::parse_dtb; } - else if (arg == string("dts")) + else if (arg == "dts") { read_fn = &device_tree::parse_dts; } else { fprintf(stderr, "Unknown input format: %s\n", optarg); return EXIT_FAILURE; } break; } case 'O': { - string arg = string(optarg); - if (arg == string("dtb")) + string arg(optarg); + if (arg == "dtb") { write_fn = &device_tree::write_binary; } - else if (arg == string("asm")) + else if (arg == "asm") { write_fn = &device_tree::write_asm; } - else if (arg == string("dts")) + else if (arg == "dts") { write_fn = &device_tree::write_dts; } else { fprintf(stderr, "Unknown output format: %s\n", optarg); return EXIT_FAILURE; } break; } case 'o': { outfile_name = optarg; outfile = open(optarg, O_CREAT | O_TRUNC | O_WRONLY, 0666); if (outfile == -1) { perror("Unable to open output file"); return EXIT_FAILURE; } break; } case 'D': debug_mode = true; break; case 'V': - if (string(optarg) != string("17")) + if (string(optarg) != "17") { fprintf(stderr, "Unknown output format version: %s\n", optarg); return EXIT_FAILURE; } break; case 'd': { if (depfile != 0) { fclose(depfile); } - if (string(optarg) == string("-")) + if (string(optarg) == "-") { depfile = stdout; } else { depfile = fdopen(open(optarg, O_CREAT | O_TRUNC | O_WRONLY, 0666), "w"); if (depfile == 0) { perror("Unable to open dependency file"); return EXIT_FAILURE; } } break; } case 'H': { - string arg = string(optarg); - if (arg == string("both")) + string arg(optarg); + if (arg == "both") { tree.set_phandle_format(device_tree::BOTH); } - else if (arg == string("epapr")) + else if (arg == "epapr") { tree.set_phandle_format(device_tree::EPAPR); } - else if (arg == string("linux")) + else if (arg == "linux") { tree.set_phandle_format(device_tree::LINUX); } else { fprintf(stderr, "Unknown phandle format: %s\n", optarg); return EXIT_FAILURE; } break; } case 'b': // Don't bother to check if strtoll fails, just // use the 0 it returns. boot_cpu = (uint32_t)strtoll(optarg, 0, 10); boot_cpu_specified = true; break; case 'f': keep_going = true; break; case 'W': case 'E': { - string arg = string(optarg); + string arg(optarg); if ((arg.size() > 3) && (strncmp(optarg, "no-", 3) == 0)) { arg = string(optarg+3); if (!checks.disable_checker(arg)) { fprintf(stderr, "Checker %s either does not exist or is already disabled\n", optarg+3); } break; } if (!checks.enable_checker(arg)) { fprintf(stderr, "Checker %s either does not exist or is already enabled\n", optarg); } break; } case 's': { sort = true; break; } case 'i': { tree.add_include_path(optarg); break; } // Should quiet warnings, but for now is silently ignored. case 'q': break; case 'R': tree.set_empty_reserve_map_entries(strtoll(optarg, 0, 10)); break; case 'S': tree.set_blob_minimum_size(strtoll(optarg, 0, 10)); break; case 'p': tree.set_blob_padding(strtoll(optarg, 0, 10)); break; case 'P': if (!tree.parse_define(optarg)) { fprintf(stderr, "Invalid predefine value %s\n", optarg); } break; default: fprintf(stderr, "Unknown option %c\n", ch); return EXIT_FAILURE; } } if (optind < argc) { in_file = argv[optind]; } if (depfile != 0) { fputs(outfile_name, depfile); fputs(": ", depfile); fputs(in_file, depfile); } clock_t c1 = clock(); (tree.*read_fn)(in_file, depfile); // Override the boot CPU found in the header, if we're loading from dtb if (boot_cpu_specified) { tree.set_boot_cpu(boot_cpu); } if (sort) { tree.sort(); } if (depfile != 0) { putc('\n', depfile); fclose(depfile); } if (!(tree.is_valid() || keep_going)) { - fprintf(stderr, "Failed to parse tree. Unhappy face!\n"); + fprintf(stderr, "Failed to parse tree.\n"); return EXIT_FAILURE; } clock_t c2 = clock(); if (!(checks.run_checks(&tree, true) || keep_going)) { return EXIT_FAILURE; } clock_t c3 = clock(); (tree.*write_fn)(outfile); close(outfile); clock_t c4 = clock(); if (debug_mode) { struct rusage r; getrusage(RUSAGE_SELF, &r); fprintf(stderr, "Peak memory usage: %ld bytes\n", r.ru_maxrss); fprintf(stderr, "Setup and option parsing took %f seconds\n", ((double)(c1-c0))/CLOCKS_PER_SEC); fprintf(stderr, "Parsing took %f seconds\n", ((double)(c2-c1))/CLOCKS_PER_SEC); fprintf(stderr, "Checking took %f seconds\n", ((double)(c3-c2))/CLOCKS_PER_SEC); fprintf(stderr, "Generating output took %f seconds\n", ((double)(c4-c3))/CLOCKS_PER_SEC); fprintf(stderr, "Total time: %f seconds\n", ((double)(c4-c0))/CLOCKS_PER_SEC); // This is not needed, but keeps valgrind quiet. fclose(stdin); } return EXIT_SUCCESS; } Index: head/usr.bin/dtc/fdt.cc =================================================================== --- head/usr.bin/dtc/fdt.cc (revision 306805) +++ head/usr.bin/dtc/fdt.cc (revision 306806) @@ -1,1616 +1,1667 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #define __STDC_LIMIT_MACROS 1 #include "fdt.hh" #include "dtb.hh" #include +#include #include #include #include #include #include #include #include #include #include #include +using std::string; + namespace dtc { namespace fdt { uint32_t property_value::get_as_uint32() { if (byte_data.size() != 4) { return 0; } uint32_t v = 0; v &= byte_data[0] << 24; v &= byte_data[1] << 16; v &= byte_data[2] << 8; v &= byte_data[3] << 0; return v; } void property_value::push_to_buffer(byte_buffer &buffer) { if (!byte_data.empty()) { buffer.insert(buffer.end(), byte_data.begin(), byte_data.end()); } else { - string_data.push_to_buffer(buffer, true); + push_string(buffer, string_data, true); // Trailing nul buffer.push_back(0); } } void property_value::write_dts(FILE *file) { resolve_type(); switch (type) { default: assert(0 && "Invalid type"); case STRING: case STRING_LIST: case CROSS_REFERENCE: write_as_string(file); break; case PHANDLE: write_as_cells(file); break; case BINARY: if (byte_data.size() % 4 == 0) { write_as_cells(file); break; } write_as_bytes(file); break; } } void property_value::resolve_type() { if (type != UNKNOWN) { return; } if (byte_data.empty()) { type = STRING; return; } if (byte_data.back() == 0) { bool is_all_printable = true; int nuls = 0; int bytes = 0; bool lastWasNull = false; for (auto i : byte_data) { bytes++; is_all_printable &= (i == '\0') || isprint(i); if (i == '\0') { // If there are two nulls in a row, then we're probably binary. if (lastWasNull) { type = BINARY; return; } nuls++; lastWasNull = true; } else { lastWasNull = false; } if (!is_all_printable) { break; } } if ((is_all_printable && (bytes > nuls)) || bytes == 0) { type = STRING; if (nuls > 1) { type = STRING_LIST; } return; } } type = BINARY; } void property_value::write_as_string(FILE *file) { putc('"', file); if (byte_data.empty()) { - string_data.print(file); + fputs(string_data.c_str(), file); } else { bool hasNull = (byte_data.back() == '\0'); // Remove trailing null bytes from the string before printing as dts. if (hasNull) { byte_data.pop_back(); } for (auto i : byte_data) { // FIXME Escape tabs, newlines, and so on. if (i == '\0') { fputs("\", \"", file); continue; } putc(i, file); } if (hasNull) { byte_data.push_back('\0'); } } putc('"', file); } void property_value::write_as_cells(FILE *file) { putc('<', file); assert((byte_data.size() % 4) == 0); for (auto i=byte_data.begin(), e=byte_data.end(); i!=e ; ++i) { uint32_t v = 0; v = (v << 8) | *i; ++i; v = (v << 8) | *i; ++i; v = (v << 8) | *i; ++i; v = (v << 8) | *i; fprintf(file, "0x%" PRIx32, v); if (i+1 != e) { putc(' ', file); } } putc('>', file); } void property_value::write_as_bytes(FILE *file) { putc('[', file); for (auto i=byte_data.begin(), e=byte_data.end(); i!=e ; i++) { fprintf(file, "%02hhx", *i); if (i+1 != e) { putc(' ', file); } } putc(']', file); } void -property::parse_string(input_buffer &input) +property::parse_string(text_input_buffer &input) { property_value v; - assert(input[0] == '"'); + assert(*input == '"'); ++input; - const char *start = (const char*)input; - int length = 0; - while (char c = input[0]) + std::vector bytes; + bool isEscaped = false; + while (char c = *input) { - if (c == '"' && input[-1] != '\\') + if (c == '"' && !isEscaped) { input.consume('"'); break; } + isEscaped = (c == '\\'); + bytes.push_back(c); ++input; - ++length; } - v.string_data = string(start, length); + v.string_data = string(bytes.begin(), bytes.end()); values.push_back(v); } void -property::parse_cells(input_buffer &input, int cell_size) +property::parse_cells(text_input_buffer &input, int cell_size) { - assert(input[0] == '<'); + assert(*input == '<'); ++input; property_value v; input.next_token(); while (!input.consume('>')) { input.next_token(); // If this is a phandle then we need to get the name of the // referenced node if (input.consume('&')) { if (cell_size != 32) { input.parse_error("reference only permitted in 32-bit arrays"); valid = false; return; } input.next_token(); - // FIXME: We should support full paths here, but we - // don't. - string referenced = string::parse_node_name(input); + bool isPath = false; + string referenced; + if (!input.consume('{')) + { + referenced = input.parse_node_name(); + } + else + { + referenced = input.parse_to('}'); + input.consume('}'); + isPath = true; + } if (referenced.empty()) { input.parse_error("Expected node name"); valid = false; return; } input.next_token(); // If we already have some bytes, make the phandle a // separate component. if (!v.byte_data.empty()) { values.push_back(v); v = property_value(); } v.string_data = referenced; v.type = property_value::PHANDLE; values.push_back(v); v = property_value(); } else { //FIXME: We should support labels in the middle //of these, but we don't. unsigned long long val; if (!input.consume_integer_expression(val)) { input.parse_error("Expected numbers in array of cells"); valid = false; return; } switch (cell_size) { case 8: v.byte_data.push_back(val); break; case 16: push_big_endian(v.byte_data, (uint16_t)val); break; case 32: push_big_endian(v.byte_data, (uint32_t)val); break; case 64: push_big_endian(v.byte_data, (uint64_t)val); break; default: assert(0 && "Invalid cell size!"); } input.next_token(); } } // Don't store an empty string value here. if (v.byte_data.size() > 0) { values.push_back(v); } } void -property::parse_bytes(input_buffer &input) +property::parse_bytes(text_input_buffer &input) { - assert(input[0] == '['); + assert(*input == '['); ++input; property_value v; input.next_token(); while (!input.consume(']')) { { //FIXME: We should support //labels in the middle of //these, but we don't. uint8_t val; if (!input.consume_hex_byte(val)) { input.parse_error("Expected hex bytes in array of bytes"); valid = false; return; } v.byte_data.push_back(val); input.next_token(); } } values.push_back(v); } void -property::parse_reference(input_buffer &input) +property::parse_reference(text_input_buffer &input) { - assert(input[0] == '&'); + assert(*input == '&'); ++input; input.next_token(); property_value v; - v.string_data = string::parse_node_name(input); + v.string_data = input.parse_node_name(); if (v.string_data.empty()) { input.parse_error("Expected node name"); valid = false; return; } v.type = property_value::CROSS_REFERENCE; values.push_back(v); } property::property(input_buffer &structs, input_buffer &strings) { uint32_t name_offset; uint32_t length; valid = structs.consume_binary(length) && structs.consume_binary(name_offset); if (!valid) { fprintf(stderr, "Failed to read property\n"); return; } // Find the name input_buffer name_buffer = strings.buffer_from_offset(name_offset); - if (name_buffer.empty()) + if (name_buffer.finished()) { fprintf(stderr, "Property name offset %" PRIu32 " is past the end of the strings table\n", name_offset); valid = false; return; } - key = string(name_buffer); + key = name_buffer.parse_to(0); // If we're empty, do not push anything as value. if (!length) return; // Read the value uint8_t byte; property_value v; for (uint32_t i=0 ; ifind(name)) == defines->end())) { input.parse_error("Undefined property name\n"); valid = false; return; } values.push_back((*found).second->values[0]); } -property::property(input_buffer &input, - string k, - string l, +property::property(text_input_buffer &input, + string &&k, + string_set &&l, bool semicolonTerminated, - define_map *defines) : key(k), label(l), valid(true) + define_map *defines) : key(k), labels(l), valid(true) { do { input.next_token(); - switch (input[0]) + switch (*input) { case '$': { parse_define(input, defines); if (valid) { break; } } default: input.parse_error("Invalid property value."); valid = false; return; case '/': { unsigned long long bits = 0; valid = input.consume("/bits/"); input.next_token(); valid &= input.consume_integer(bits); if ((bits != 8) && (bits != 16) && (bits != 32) && (bits != 64)) { input.parse_error("Invalid size for elements"); valid = false; } if (!valid) return; input.next_token(); - if (input[0] != '<') + if (*input != '<') { input.parse_error("/bits/ directive is only valid on arrays"); valid = false; return; } parse_cells(input, bits); break; } case '"': parse_string(input); break; case '<': parse_cells(input, 32); break; case '[': parse_bytes(input); break; case '&': parse_reference(input); break; case ';': { break; } } input.next_token(); } while (input.consume(',')); if (semicolonTerminated && !input.consume(';')) { input.parse_error("Expected ; at end of property"); valid = false; } } property_ptr property::parse_dtb(input_buffer &structs, input_buffer &strings) { property_ptr p(new property(structs, strings)); if (!p->valid) { p = nullptr; } return p; } property_ptr -property::parse(input_buffer &input, string key, string label, +property::parse(text_input_buffer &input, string &&key, string_set &&label, bool semicolonTerminated, define_map *defines) { - property_ptr p(new property(input, key, label, semicolonTerminated, defines)); + property_ptr p(new property(input, + std::move(key), + std::move(label), + semicolonTerminated, + defines)); if (!p->valid) { p = nullptr; } return p; } void property::write(dtb::output_writer &writer, dtb::string_table &strings) { writer.write_token(dtb::FDT_PROP); byte_buffer value_buffer; for (value_iterator i=begin(), e=end() ; i!=e ; ++i) { i->push_to_buffer(value_buffer); } writer.write_data((uint32_t)value_buffer.size()); writer.write_comment(key); writer.write_data(strings.add_string(key)); writer.write_data(value_buffer); } bool property_value::try_to_merge(property_value &other) { resolve_type(); switch (type) { case UNKNOWN: __builtin_unreachable(); assert(0); return false; case EMPTY: *this = other; case STRING: case STRING_LIST: case CROSS_REFERENCE: return false; case PHANDLE: case BINARY: if (other.type == PHANDLE || other.type == BINARY) { type = BINARY; byte_data.insert(byte_data.end(), other.byte_data.begin(), other.byte_data.end()); return true; } } return false; } void property::write_dts(FILE *file, int indent) { for (int i=0 ; i *vals = &values; std::vector v; // If we've got multiple values then try to merge them all together. if (values.size() > 1) { vals = &v; v.push_back(values.front()); for (auto i=(++begin()), e=end() ; i!=e ; ++i) { if (!v.back().try_to_merge(*i)) { v.push_back(*i); } } } fputs(" = ", file); for (auto i=vals->begin(), e=vals->end() ; i!=e ; ++i) { i->write_dts(file); if (i+1 != e) { putc(',', file); putc(' ', file); } } } fputs(";\n", file); } string -node::parse_name(input_buffer &input, bool &is_property, const char *error) +node::parse_name(text_input_buffer &input, bool &is_property, const char *error) { if (!valid) { return string(); } input.next_token(); if (is_property) { - return string::parse_property_name(input); + return input.parse_property_name(); } - string n = string::parse_node_or_property_name(input, is_property); + string n = input.parse_node_or_property_name(is_property); if (n.empty()) { if (n.empty()) { input.parse_error(error); valid = false; } } return n; } void node::visit(std::function fn) { fn(*this); for (auto &&c : children) { c->visit(fn); } } node::node(input_buffer &structs, input_buffer &strings) : valid(true) { - const char *name_start = (const char*)structs; - int name_length = 0; + std::vector bytes; while (structs[0] != '\0' && structs[0] != '@') { - name_length++; + bytes.push_back(structs[0]); ++structs; } - name = string(name_start, name_length); + name = string(bytes.begin(), bytes.end()); + bytes.clear(); if (structs[0] == '@') { ++structs; - name_start = (const char*)structs; - name_length = 0; while (structs[0] != '\0') { - name_length++; + bytes.push_back(structs[0]); ++structs; } - unit_address = string(name_start, name_length); + unit_address = string(bytes.begin(), bytes.end()); } ++structs; uint32_t token; while (structs.consume_binary(token)) { switch (token) { default: fprintf(stderr, "Unexpected token 0x%" PRIx32 " while parsing node.\n", token); valid = false; return; // Child node, parse it. case dtb::FDT_BEGIN_NODE: { node_ptr child = node::parse_dtb(structs, strings); if (child == 0) { valid = false; return; } children.push_back(std::move(child)); break; } // End of this node, no errors. case dtb::FDT_END_NODE: return; // Property, parse it. case dtb::FDT_PROP: { property_ptr prop = property::parse_dtb(structs, strings); if (prop == 0) { valid = false; return; } props.push_back(prop); break; } break; // End of structs table. Should appear after // the end of the last node. case dtb::FDT_END: fprintf(stderr, "Unexpected FDT_END token while parsing node.\n"); valid = false; return; // NOPs are padding. Ignore them. case dtb::FDT_NOP: break; } } fprintf(stderr, "Failed to read token from structs table while parsing node.\n"); valid = false; return; } -node::node(input_buffer &input, string n, string l, string a, define_map *defines) : - label(l), name(n), unit_address(a), valid(true) +node::node(text_input_buffer &input, + string &&n, + std::unordered_set &&l, + string &&a, + define_map *defines) + : labels(l), name(n), unit_address(a), valid(true) { if (!input.consume('{')) { input.parse_error("Expected { to start new device tree node.\n"); } input.next_token(); while (valid && !input.consume('}')) { // flag set if we find any characters that are only in // the property name character set, not the node bool is_property = false; - string child_name, child_label, child_address; + string child_name, child_address; + std::unordered_set child_labels; + auto parse_delete = [&](const char *expected, bool at) + { + if (child_name == string()) + { + input.parse_error(expected); + valid = false; + return; + } + input.next_token(); + if (at && input.consume('@')) + { + child_name += '@'; + child_name += parse_name(input, is_property, "Expected unit address"); + } + if (!input.consume(';')) + { + input.parse_error("Expected semicolon"); + valid = false; + return; + } + input.next_token(); + }; + if (input.consume("/delete-node/")) + { + input.next_token(); + child_name = input.parse_node_name(); + parse_delete("Expected node name", true); + if (valid) + { + deleted_children.insert(child_name); + } + continue; + } + if (input.consume("/delete-property/")) + { + input.next_token(); + child_name = input.parse_property_name(); + parse_delete("Expected property name", false); + if (valid) + { + deleted_props.insert(child_name); + } + continue; + } child_name = parse_name(input, is_property, "Expected property or node name"); - if (input.consume(':')) + while (input.consume(':')) { // Node labels can contain any characters? The // spec doesn't say, so we guess so... is_property = false; - child_label = child_name; + child_labels.insert(std::move(child_name)); child_name = parse_name(input, is_property, "Expected property or node name"); } if (input.consume('@')) { child_address = parse_name(input, is_property, "Expected unit address"); } if (!valid) { return; } input.next_token(); // If we're parsing a property, then we must actually do that. if (input.consume('=')) { - property_ptr p = property::parse(input, child_name, - child_label, true, defines); + property_ptr p = property::parse(input, std::move(child_name), + std::move(child_labels), true, defines); if (p == 0) { valid = false; } else { props.push_back(p); } } - else if (!is_property && input[0] == ('{')) + else if (!is_property && *input == ('{')) { - node_ptr child = node::parse(input, child_name, - child_label, child_address, defines); + node_ptr child = node::parse(input, std::move(child_name), + std::move(child_labels), std::move(child_address), defines); if (child) { children.push_back(std::move(child)); } else { valid = false; } } else if (input.consume(';')) { - props.push_back(property_ptr(new property(child_name, child_label))); + props.push_back(property_ptr(new property(std::move(child_name), std::move(child_labels)))); } else { - input.parse_error("Error parsing property."); + input.parse_error("Error parsing property. Expected property value"); valid = false; } input.next_token(); } + input.next_token(); input.consume(';'); } bool node::cmp_properties(property_ptr &p1, property_ptr &p2) { return p1->get_key() < p2->get_key(); } bool node::cmp_children(node_ptr &c1, node_ptr &c2) { if (c1->name == c2->name) { return c1->unit_address < c2->unit_address; } return c1->name < c2->name; } void node::sort() { std::sort(property_begin(), property_end(), cmp_properties); std::sort(child_begin(), child_end(), cmp_children); for (auto &c : child_nodes()) { c->sort(); } } node_ptr -node::parse(input_buffer &input, - string name, - string label, - string address, +node::parse(text_input_buffer &input, + string &&name, + string_set &&label, + string &&address, define_map *defines) { - node_ptr n(new node(input, name, label, address, defines)); + node_ptr n(new node(input, + std::move(name), + std::move(label), + std::move(address), + defines)); if (!n->valid) { n = 0; } return n; } node_ptr node::parse_dtb(input_buffer &structs, input_buffer &strings) { node_ptr n(new node(structs, strings)); if (!n->valid) { n = 0; } return n; } property_ptr -node::get_property(string key) +node::get_property(const string &key) { for (auto &i : props) { if (i->get_key() == key) { return i; } } return 0; } void node::merge_node(node_ptr other) { - if (!other->label.empty()) + for (auto &l : other->labels) { - label = other->label; + labels.insert(l); } // Note: this is an O(n*m) operation. It might be sensible to // optimise this if we find that there are nodes with very // large numbers of properties, but for typical usage the // entire vector will fit (easily) into cache, so iterating // over it repeatedly isn't that expensive. for (auto &p : other->properties()) { bool found = false; for (auto &mp : properties()) { if (mp->get_key() == p->get_key()) { mp = p; found = true; break; } } if (!found) { add_property(p); } } for (auto &c : other->children) { bool found = false; for (auto &i : children) { if (i->name == c->name && i->unit_address == c->unit_address) { i->merge_node(std::move(c)); found = true; break; } } if (!found) { children.push_back(std::move(c)); } } + children.erase(std::remove_if(children.begin(), children.end(), + [&](const node_ptr &p) { + string full_name = p->name; + if (p->unit_address != string()) + { + full_name += '@'; + full_name += p->unit_address; + } + if (other->deleted_children.count(full_name) > 0) + { + other->deleted_children.erase(full_name); + return true; + } + return false; + }), children.end()); + props.erase(std::remove_if(props.begin(), props.end(), + [&](const property_ptr &p) { + if (other->deleted_props.count(p->get_key()) > 0) + { + other->deleted_props.erase(p->get_key()); + return true; + } + return false; + }), props.end()); } void node::write(dtb::output_writer &writer, dtb::string_table &strings) { writer.write_token(dtb::FDT_BEGIN_NODE); byte_buffer name_buffer; - name.push_to_buffer(name_buffer); + push_string(name_buffer, name); if (unit_address != string()) { name_buffer.push_back('@'); - unit_address.push_to_buffer(name_buffer); + push_string(name_buffer, unit_address); } writer.write_comment(name); writer.write_data(name_buffer); writer.write_data((uint8_t)0); for (auto p : properties()) { p->write(writer, strings); } for (auto &c : child_nodes()) { c->write(writer, strings); } writer.write_token(dtb::FDT_END_NODE); } void node::write_dts(FILE *file, int indent) { for (int i=0 ; iwrite_dts(file, indent+1); } for (auto &c : child_nodes()) { c->write_dts(file, indent+1); } for (int i=0 ; ilabel; path.push_back(std::make_pair(n->name, n->unit_address)); - if (name != string()) + for (const string &name : n->labels) { - if (node_names.find(name) == node_names.end()) + if (name != string()) { - node_names.insert(std::make_pair(name, n.get())); - node_paths.insert(std::make_pair(name, path)); - } - else - { - node_names[name] = (node*)-1; - auto i = node_paths.find(name); - if (i != node_paths.end()) + auto iter = node_names.find(name); + if (iter == node_names.end()) { - node_paths.erase(name); + node_names.insert(std::make_pair(name, n.get())); + node_paths.insert(std::make_pair(name, path)); } - fprintf(stderr, "Label not unique: "); - name.dump(); - fprintf(stderr, ". References to this label will not be resolved."); + else + { + node_names.erase(iter); + auto i = node_paths.find(name); + if (i != node_paths.end()) + { + node_paths.erase(name); + } + fprintf(stderr, "Label not unique: %s. References to this label will not be resolved.\n", name.c_str()); + } } } for (auto &c : n->child_nodes()) { collect_names_recursive(c, path); } path.pop_back(); // Now we collect the phandles and properties that reference // other nodes. for (auto &p : n->properties()) { for (auto &v : *p) { if (v.is_phandle()) { phandles.push_back(&v); } if (v.is_cross_reference()) { cross_references.push_back(&v); } } - if (p->get_key() == string("phandle") || - p->get_key() == string("linux,phandle")) + if ((p->get_key() == "phandle") || + (p->get_key() == "linux,phandle")) { if (p->begin()->byte_data.size() != 4) { - fprintf(stderr, "Invalid phandle value for node "); - n->name.dump(); - fprintf(stderr, ". Should be a 4-byte value.\n"); + fprintf(stderr, "Invalid phandle value for node %s. Should be a 4-byte value.\n", n->name.c_str()); valid = false; } else { uint32_t phandle = p->begin()->get_as_uint32(); used_phandles.insert(std::make_pair(phandle, n.get())); } } } } void device_tree::collect_names() { node_path p; node_names.clear(); node_paths.clear(); cross_references.clear(); phandles.clear(); collect_names_recursive(root, p); } void device_tree::resolve_cross_references() { for (auto *pv : cross_references) { node_path path = node_paths[pv->string_data]; - // Skip the first name in the path. It's always "", and implicitly / - for (auto p=path.begin()+1, pe=path.end() ; p!=pe ; ++p) + auto p = path.begin(); + auto pe = path.end(); + if (p != pe) { - pv->byte_data.push_back('/'); - p->first.push_to_buffer(pv->byte_data); - if (!(p->second.empty())) + // Skip the first name in the path. It's always "", and implicitly / + for (++p ; p!=pe ; ++p) { - pv->byte_data.push_back('@'); - p->second.push_to_buffer(pv->byte_data); - pv->byte_data.push_back(0); + pv->byte_data.push_back('/'); + push_string(pv->byte_data, p->first); + if (!(p->second.empty())) + { + pv->byte_data.push_back('@'); + push_string(pv->byte_data, p->second); + pv->byte_data.push_back(0); + } } } } std::unordered_set phandle_set; for (auto &i : phandles) { phandle_set.insert(i); } std::vector sorted_phandles; root->visit([&](node &n) { for (auto &p : n.properties()) { for (auto &v : *p) { if (phandle_set.count(&v)) { sorted_phandles.push_back(&v); } } } }); assert(sorted_phandles.size() == phandles.size()); uint32_t phandle = 1; for (auto &i : sorted_phandles) { string target_name = i->string_data; - node *target = node_names[target_name]; - if (target == 0) + node *target = nullptr; + string possible; + // If the node name is a path, then look it up by following the path, + // otherwise jump directly to the named node. + if (target_name[0] == '/') { - fprintf(stderr, "Failed to find node with label: "); - target_name.dump(); - fprintf(stderr, "\n"); + std::string path; + target = root.get(); + std::istringstream ss(target_name); + string path_element; + // Read the leading / + std::getline(ss, path_element, '/'); + // Iterate over path elements + while (!ss.eof()) + { + path += '/'; + std::getline(ss, path_element, '/'); + std::istringstream nss(path_element); + string node_name, node_address; + std::getline(nss, node_name, '@'); + std::getline(nss, node_address, '@'); + node *next = nullptr; + for (auto &c : target->child_nodes()) + { + if (c->name == node_name) + { + if (c->unit_address == node_address) + { + next = c.get(); + break; + } + else + { + possible = path + c->name; + if (c->unit_address != string()) + { + possible += '@'; + possible += c->unit_address; + } + } + } + } + path += node_name; + if (node_address != string()) + { + path += '@'; + path += node_address; + } + target = next; + if (target == nullptr) + { + break; + } + } + } + else + { + target = node_names[target_name]; + } + if (target == nullptr) + { + fprintf(stderr, "Failed to find node with label: %s\n", target_name.c_str()); + if (possible != string()) + { + fprintf(stderr, "Possible intended match: %s\n", possible.c_str()); + } valid = 0; return; } // If there is an existing phandle, use it property_ptr p = target->get_property("phandle"); if (p == 0) { p = target->get_property("linux,phandle"); } if (p == 0) { // Otherwise insert a new phandle node property_value v; while (used_phandles.find(phandle) != used_phandles.end()) { // Note that we only don't need to // store this phandle in the set, // because we are monotonically // increasing the value of phandle and // so will only ever revisit this value // if we have used 2^32 phandles, at // which point our blob won't fit in // any 32-bit system and we've done // something badly wrong elsewhere // already. phandle++; } push_big_endian(v.byte_data, phandle++); if (phandle_node_name == BOTH || phandle_node_name == LINUX) { - p.reset(new property(string("linux,phandle"))); + p.reset(new property("linux,phandle")); p->add_value(v); target->add_property(p); } if (phandle_node_name == BOTH || phandle_node_name == EPAPR) { - p.reset(new property(string("phandle"))); + p.reset(new property("phandle")); p->add_value(v); target->add_property(p); } } p->begin()->push_to_buffer(i->byte_data); assert(i->byte_data.size() == 4); } } -bool -device_tree::parse_include(input_buffer &input, - const std::string &dir, - std::vector &roots, - FILE *depfile, - bool &read_header) -{ - if (!input.consume("/include/")) - { - return false; - } - bool reallyInclude = true; - if (input.consume("if ")) - { - input.next_token(); - string name = string::parse_property_name(input); - // XXX: Error handling - if (defines.find(name) == defines.end()) - { - reallyInclude = false; - } - input.consume('/'); - } - input.next_token(); - if (!input.consume('"')) - { - input.parse_error("Expected quoted filename"); - valid = false; - return false; - } - int length = 0; - while (input[length] != '"') length++; - std::string file((const char*)input, length); - std::string include_file = dir + '/' + file; - input.consume(file.c_str()); - if (!reallyInclude) - { - input.consume('"'); - input.next_token(); - return true; - } - - input_buffer *include_buffer = buffer_for_file(include_file.c_str(), false); - - if (include_buffer == 0) - { - for (auto i : include_paths) - { - include_file = i + '/' + file; - include_buffer = buffer_for_file(include_file.c_str()); - if (include_buffer != 0) - { - break; - } - } - } - if (depfile != 0) - { - putc(' ', depfile); - fputs(include_file.c_str(), depfile); - } - if (include_buffer == 0) - { - input.parse_error("Unable to locate input file"); - input.consume('"'); - input.next_token(); - valid = false; - return true; - } - input.consume('"'); - input.next_token(); - parse_file(*include_buffer, dir, roots, depfile, read_header); - return true; -} - void -device_tree::parse_file(input_buffer &input, - const std::string &dir, +device_tree::parse_file(text_input_buffer &input, std::vector &roots, - FILE *depfile, bool &read_header) { input.next_token(); // Read the header if (input.consume("/dts-v1/;")) { read_header = true; } input.next_token(); input.next_token(); if (!read_header) { input.parse_error("Expected /dts-v1/; version string"); } - while(parse_include(input, dir, roots, depfile, read_header)) {} // Read any memory reservations - while(input.consume("/memreserve/")) + while (input.consume("/memreserve/")) { unsigned long long start, len; input.next_token(); // Read the start and length. if (!(input.consume_integer_expression(start) && (input.next_token(), input.consume_integer_expression(len)))) { input.parse_error("Expected size on /memreserve/ node."); } input.next_token(); input.consume(';'); reservations.push_back(reservation(start, len)); + input.next_token(); } - input.next_token(); - while(parse_include(input, dir, roots, depfile, read_header)) {} while (valid && !input.finished()) { node_ptr n; if (input.consume('/')) { input.next_token(); - n = node::parse(input, string(), string(), string(), &defines); + n = node::parse(input, string(), string_set(), string(), &defines); } else if (input.consume('&')) { input.next_token(); - string name = string::parse_node_name(input); + string name = input.parse_node_name(); input.next_token(); - n = node::parse(input, name, string(), string(), &defines); + n = node::parse(input, std::move(name), string_set(), string(), &defines); } else { input.parse_error("Failed to find root node /."); } if (n) { roots.push_back(std::move(n)); } else { valid = false; } input.next_token(); - while(parse_include(input, dir, roots, depfile, read_header)) {} } } -input_buffer* -device_tree::buffer_for_file(const char *path, bool warn) -{ - if (string(path) == string("-")) - { - input_buffer *b = new stream_input_buffer(); - if (b) - { - std::unique_ptr ptr(b); - buffers.push_back(std::move(ptr)); - } - return b; - } - int source = open(path, O_RDONLY); - if (source == -1) - { - if (warn) - { - fprintf(stderr, "Unable to open file '%s'. %s\n", path, strerror(errno)); - } - return 0; - } - struct stat st; - if (fstat(source, &st) == 0 && S_ISDIR(st.st_mode)) - { - fprintf(stderr, "File %s is a directory\n", path); - close(source); - return 0; - } - input_buffer *b = new mmap_input_buffer(source); - // Keep the buffer that owns the memory around for the lifetime - // of this FDT. Ones simply referring to it may have shorter - // lifetimes. - if (b) - { - std::unique_ptr ptr(b); - buffers.push_back(std::move(ptr)); - } - close(source); - return b; -} - template void device_tree::write(int fd) { dtb::string_table st; dtb::header head; writer head_writer; writer reservation_writer; writer struct_writer; writer strings_writer; // Build the reservation table reservation_writer.write_comment(string("Memory reservations")); reservation_writer.write_label(string("dt_reserve_map")); for (auto &i : reservations) { reservation_writer.write_comment(string("Reservation start")); reservation_writer.write_data(i.first); reservation_writer.write_comment(string("Reservation length")); reservation_writer.write_data(i.first); } // Write n spare reserve map entries, plus the trailing 0. for (uint32_t i=0 ; i<=spare_reserve_map_entries ; i++) { reservation_writer.write_data((uint64_t)0); reservation_writer.write_data((uint64_t)0); } struct_writer.write_comment(string("Device tree")); struct_writer.write_label(string("dt_struct_start")); root->write(struct_writer, st); struct_writer.write_token(dtb::FDT_END); struct_writer.write_label(string("dt_struct_end")); st.write(strings_writer); // Find the strings size before we stick padding on the end. // Note: We should possibly use a new writer for the padding. head.size_dt_strings = strings_writer.size(); // Stick the padding in the strings writer, but after the // marker indicating that it's the end. // Note: We probably should add a padding call to the writer so // that the asm back end can write padding directives instead // of a load of 0 bytes. for (uint32_t i=0 ; i(fd); } void device_tree::write_asm(int fd) { write(fd); } void device_tree::write_dts(int fd) { FILE *file = fdopen(fd, "w"); fputs("/dts-v1/;\n\n", file); if (!reservations.empty()) { const char msg[] = "/memreserve/"; fwrite(msg, sizeof(msg), 1, file); for (auto &i : reservations) { fprintf(file, " %" PRIx64 " %" PRIx64, i.first, i.second); } fputs(";\n\n", file); } putc('/', file); putc(' ', file); root->write_dts(file, 0); fclose(file); } void -device_tree::parse_dtb(const char *fn, FILE *) +device_tree::parse_dtb(const string &fn, FILE *) { - input_buffer *in = buffer_for_file(fn); + auto in = input_buffer::buffer_for_file(fn); if (in == 0) { valid = false; return; } input_buffer &input = *in; dtb::header h; valid = h.read_dtb(input); boot_cpu = h.boot_cpuid_phys; if (h.last_comp_version > 17) { fprintf(stderr, "Don't know how to read this version of the device tree blob"); valid = false; } if (!valid) { return; } input_buffer reservation_map = input.buffer_from_offset(h.off_mem_rsvmap, 0); uint64_t start, length; do { if (!(reservation_map.consume_binary(start) && reservation_map.consume_binary(length))) { fprintf(stderr, "Failed to read memory reservation table\n"); valid = false; return; } } while (!((start == 0) && (length == 0))); input_buffer struct_table = input.buffer_from_offset(h.off_dt_struct, h.size_dt_struct); input_buffer strings_table = input.buffer_from_offset(h.off_dt_strings, h.size_dt_strings); uint32_t token; if (!(struct_table.consume_binary(token) && (token == dtb::FDT_BEGIN_NODE))) { fprintf(stderr, "Expected FDT_BEGIN_NODE token.\n"); valid = false; return; } root = node::parse_dtb(struct_table, strings_table); if (!(struct_table.consume_binary(token) && (token == dtb::FDT_END))) { fprintf(stderr, "Expected FDT_END token after parsing root node.\n"); valid = false; return; } valid = (root != 0); } void -device_tree::parse_dts(const char *fn, FILE *depfile) +device_tree::parse_dts(const string &fn, FILE *depfile) { - input_buffer *in = buffer_for_file(fn); - std::string dir(dirname((char*)fn)); - if (in == 0) + auto in = input_buffer::buffer_for_file(fn); + if (!in) { valid = false; return; } std::vector roots; - input_buffer &input = *in; + std::unordered_set defnames; + for (auto &i : defines) + { + defnames.insert(i.first); + } + text_input_buffer input(std::move(in), + std::move(defnames), + std::vector(include_paths), + dirname(fn), + depfile); bool read_header = false; - parse_file(input, dir, roots, depfile, read_header); + parse_file(input, roots, read_header); switch (roots.size()) { case 0: valid = false; input.parse_error("Failed to find root node /."); return; case 1: root = std::move(roots[0]); break; default: { root = std::move(roots[0]); for (auto i=++(roots.begin()), e=roots.end() ; i!=e ; ++i) { auto &node = *i; string name = node->name; if (name == string()) { root->merge_node(std::move(node)); } else { auto existing = node_names.find(name); if (existing == node_names.end()) { collect_names(); existing = node_names.find(name); } if (existing == node_names.end()) { - fprintf(stderr, "Unable to merge node: "); - name.dump(); - fprintf(stderr, "\n"); + fprintf(stderr, "Unable to merge node: %s\n", name.c_str()); } - existing->second->merge_node(std::move(node)); + else + { + existing->second->merge_node(std::move(node)); + } } } } } collect_names(); resolve_cross_references(); } bool device_tree::parse_define(const char *def) { char *val = strchr(def, '='); if (!val) { if (strlen(def) != 0) { string name(def); defines[name]; return true; } return false; } string name(def, val-def); + string name_copy = name; val++; - input_buffer in = input_buffer(val, strlen(val)); - property_ptr p = property::parse(in, name, string(), false); + std::unique_ptr raw(new input_buffer(val, strlen(val))); + text_input_buffer in(std::move(raw), + std::unordered_set(), + std::vector(), + std::string(), + nullptr); + property_ptr p = property::parse(in, std::move(name_copy), string_set(), false); if (p) defines[name] = p; return (bool)p; } } // namespace fdt } // namespace dtc Index: head/usr.bin/dtc/fdt.hh =================================================================== --- head/usr.bin/dtc/fdt.hh (revision 306805) +++ head/usr.bin/dtc/fdt.hh (revision 306806) @@ -1,866 +1,888 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _FDT_HH_ #define _FDT_HH_ #include #include #include #include #include #include "util.hh" -#include "string.hh" +#include "input_buffer.hh" namespace dtc { namespace dtb { struct output_writer; class string_table; } namespace fdt { class property; class node; /** * Type for (owned) pointers to properties. */ typedef std::shared_ptr property_ptr; /** * Owning pointer to a node. */ typedef std::unique_ptr node_ptr; /** * Map from macros to property pointers. */ -typedef std::unordered_map define_map; +typedef std::unordered_map define_map; /** + * Set of strings used for label names. + */ +typedef std::unordered_set string_set; +/** * Properties may contain a number of different value, each with a different * label. This class encapsulates a single value. */ struct property_value { /** * The label for this data. This is usually empty. */ - string label; + std::string label; /** * If this value is a string, or something resolved from a string (a * reference) then this contains the source string. */ - string string_data; + std::string string_data; /** * The data that should be written to the final output. */ byte_buffer byte_data; /** * Enumeration describing the possible types of a value. Note that * property-coded arrays will appear simply as binary (or possibly * string, if they happen to be nul-terminated and printable), and must * be checked separately. */ enum value_type { /** * This is a list of strings. When read from source, string * lists become one property value for each string, however * when read from binary we have a single property value * incorporating the entire text, with nul bytes separating the * strings. */ STRING_LIST, /** * This property contains a single string. */ STRING, /** * This is a binary value. Check the size of byte_data to * determine how many bytes this contains. */ BINARY, /** This contains a short-form address that should be replaced * by a fully-qualified version. This will only appear when * the input is a device tree source. When parsed from a * device tree blob, the cross reference will have already been * resolved and the property value will be a string containing * the full path of the target node. */ CROSS_REFERENCE, /** * This is a phandle reference. When parsed from source, the * string_data will contain the node label for the target and, * after cross references have been resolved, the binary data * will contain a 32-bit integer that should match the phandle * property of the target node. */ PHANDLE, /** * An empty property value. This will never appear on a real * property value, it is used by checkers to indicate that no * property values should exist for a property. */ EMPTY, /** * The type of this property has not yet been determined. */ UNKNOWN }; /** * The type of this property. */ value_type type; /** * Returns true if this value is a cross reference, false otherwise. */ inline bool is_cross_reference() { return is_type(CROSS_REFERENCE); } /** * Returns true if this value is a phandle reference, false otherwise. */ inline bool is_phandle() { return is_type(PHANDLE); } /** * Returns true if this value is a string, false otherwise. */ inline bool is_string() { return is_type(STRING); } /** * Returns true if this value is a string list (a nul-separated * sequence of strings), false otherwise. */ inline bool is_string_list() { return is_type(STRING_LIST); } /** * Returns true if this value is binary, false otherwise. */ inline bool is_binary() { return is_type(BINARY); } /** * Returns this property value as a 32-bit integer. Returns 0 if this * property value is not 32 bits long. The bytes in the property value * are assumed to be in big-endian format, but the return value is in * the host native endian. */ uint32_t get_as_uint32(); /** * Default constructor, specifying the label of the value. */ - property_value(string l=string()) : label(l), type(UNKNOWN) {} + property_value(std::string l=std::string()) : label(l), type(UNKNOWN) {} /** * Writes the data for this value into an output buffer. */ void push_to_buffer(byte_buffer &buffer); /** * Writes the property value to the standard output. This uses the * following heuristics for deciding how to print the output: * * - If the value is nul-terminated and only contains printable * characters, it is written as a string. * - If it is a multiple of 4 bytes long, then it is printed as cells. * - Otherwise, it is printed as a byte buffer. */ void write_dts(FILE *file); /** * Tries to merge adjacent property values, returns true if it succeeds and * false otherwise. */ bool try_to_merge(property_value &other); private: /** * Returns whether the value is of the specified type. If the type of * the value has not yet been determined, then this calculates it. */ inline bool is_type(value_type v) { if (type == UNKNOWN) { resolve_type(); } return type == v; } /** * Determines the type of the value based on its contents. */ void resolve_type(); /** * Writes the property value to the specified file as a quoted string. * This is used when generating DTS. */ void write_as_string(FILE *file); /** * Writes the property value to the specified file as a sequence of * 32-bit big-endian cells. This is used when generating DTS. */ void write_as_cells(FILE *file); /** * Writes the property value to the specified file as a sequence of * bytes. This is used when generating DTS. */ void write_as_bytes(FILE *file); }; /** * A value encapsulating a single property. This contains a key, optionally a * label, and optionally one or more values. */ class property { /** * The name of this property. */ - string key; + std::string key; /** - * An optional label. + * Zero or more labels. */ - string label; + string_set labels; /** * The values in this property. */ std::vector values; /** * Value indicating that this is a valid property. If a parse error * occurs, then this value is false. */ bool valid; /** * Parses a string property value, i.e. a value enclosed in double quotes. */ - void parse_string(input_buffer &input); + void parse_string(text_input_buffer &input); /** * Parses one or more 32-bit values enclosed in angle brackets. */ - void parse_cells(input_buffer &input, int cell_size); + void parse_cells(text_input_buffer &input, int cell_size); /** * Parses an array of bytes, contained within square brackets. */ - void parse_bytes(input_buffer &input); + void parse_bytes(text_input_buffer &input); /** * Parses a reference. This is a node label preceded by an ampersand * symbol, which should expand to the full path to that node. * * Note: The specification says that the target of such a reference is * a node name, however dtc assumes that it is a label, and so we * follow their interpretation for compatibility. */ - void parse_reference(input_buffer &input); + void parse_reference(text_input_buffer &input); /** * Parse a predefined macro definition for a property. */ - void parse_define(input_buffer &input, define_map *defines); + void parse_define(text_input_buffer &input, define_map *defines); /** * Constructs a new property from two input buffers, pointing to the * struct and strings tables in the device tree blob, respectively. * The structs input buffer is assumed to have just consumed the * FDT_PROP token. */ property(input_buffer &structs, input_buffer &strings); /** * Parses a new property from the input buffer. */ - property(input_buffer &input, - string k, - string l, + property(text_input_buffer &input, + std::string &&k, + string_set &&l, bool terminated, define_map *defines); public: /** * Creates an empty property. */ - property(string k, string l=string()) : key(k), label(l), valid(true) - {} + property(std::string &&k, string_set &&l=string_set()) + : key(k), labels(l), valid(true) {} /** * Copy constructor. */ - property(property &p) : key(p.key), label(p.label), values(p.values), + property(property &p) : key(p.key), labels(p.labels), values(p.values), valid(p.valid) {} /** * Factory method for constructing a new property. Attempts to parse a * property from the input, and returns it on success. On any parse * error, this will return 0. */ static property_ptr parse_dtb(input_buffer &structs, - input_buffer &strings); + input_buffer &strings); /** * Factory method for constructing a new property. Attempts to parse a * property from the input, and returns it on success. On any parse * error, this will return 0. */ - static property_ptr parse(input_buffer &input, - string key, - string label=string(), + static property_ptr parse(text_input_buffer &input, + std::string &&key, + string_set &&labels=string_set(), bool semicolonTerminated=true, define_map *defines=0); /** * Iterator type used for accessing the values of a property. */ typedef std::vector::iterator value_iterator; /** * Returns an iterator referring to the first value in this property. */ inline value_iterator begin() { return values.begin(); } /** * Returns an iterator referring to the last value in this property. */ inline value_iterator end() { return values.end(); } /** * Adds a new value to an existing property. */ inline void add_value(property_value v) { values.push_back(v); } /** * Returns the key for this property. */ - inline string get_key() + inline std::string get_key() { return key; } /** * Writes the property to the specified writer. The property name is a * reference into the strings table. */ void write(dtb::output_writer &writer, dtb::string_table &strings); /** * Writes in DTS format to the specified file, at the given indent * level. This will begin the line with the number of tabs specified * as the indent level and then write the property in the most * applicable way that it can determine. */ void write_dts(FILE *file, int indent); }; /** * Class encapsulating a device tree node. Nodes may contain properties and * other nodes. */ class node { public: /** - * The label for this node, if any. Node labels are used as the + * The labels for this node, if any. Node labels are used as the * targets for cross references. */ - string label; + std::unordered_set labels; /** * The name of the node. */ - string name; + std::string name; /** * The unit address of the node, which is optionally written after the * name followed by an at symbol. */ - string unit_address; + std::string unit_address; /** * The type for the property vector. */ typedef std::vector property_vector; /** * Iterator type for child nodes. */ typedef std::vector::iterator child_iterator; private: /** * Adaptor to use children in range-based for loops. */ struct child_range { child_range(node &nd) : n(nd) {} child_iterator begin() { return n.child_begin(); } child_iterator end() { return n.child_end(); } private: node &n; }; /** * Adaptor to use properties in range-based for loops. */ struct property_range { property_range(node &nd) : n(nd) {} property_vector::iterator begin() { return n.property_begin(); } property_vector::iterator end() { return n.property_end(); } private: node &n; }; /** * The properties contained within this node. */ property_vector props; /** * The children of this node. */ std::vector children; /** + * Children that should be deleted from this node when merging. + */ + std::unordered_set deleted_children; + /** + * Properties that should be deleted from this node when merging. + */ + std::unordered_set deleted_props; + /** * A flag indicating whether this node is valid. This is set to false * if an error occurs during parsing. */ bool valid; /** * Parses a name inside a node, writing the string passed as the last * argument as an error if it fails. */ - string parse_name(input_buffer &input, - bool &is_property, - const char *error); + std::string parse_name(text_input_buffer &input, + bool &is_property, + const char *error); /** * Constructs a new node from two input buffers, pointing to the struct * and strings tables in the device tree blob, respectively. */ node(input_buffer &structs, input_buffer &strings); /** * Parses a new node from the specified input buffer. This is called * when the input cursor is on the open brace for the start of the * node. The name, and optionally label and unit address, should have * already been parsed. */ - node(input_buffer &input, string n, string l, string a, define_map*); + node(text_input_buffer &input, + std::string &&n, + std::unordered_set &&l, + std::string &&a, + define_map*); /** * Comparison function for properties, used when sorting the properties * vector. Orders the properties based on their names. */ static inline bool cmp_properties(property_ptr &p1, property_ptr &p2); /* { return p1->get_key() < p2->get_key(); } */ /** * Comparison function for nodes, used when sorting the children * vector. Orders the nodes based on their names or, if the names are * the same, by the unit addresses. */ static inline bool cmp_children(node_ptr &c1, node_ptr &c2); public: /** * Sorts the node's properties and children into alphabetical order and * recursively sorts the children. */ void sort(); /** * Returns an iterator for the first child of this node. */ inline child_iterator child_begin() { return children.begin(); } /** * Returns an iterator after the last child of this node. */ inline child_iterator child_end() { return children.end(); } + /** + * Returns a range suitable for use in a range-based for loop describing + * the children of this node. + */ inline child_range child_nodes() { return child_range(*this); } + /** + * Accessor for the deleted children. + */ + inline const std::unordered_set &deleted_child_nodes() + { + return deleted_children; + } + /** + * Accessor for the deleted properties + */ + inline const std::unordered_set &deleted_properties() + { + return deleted_props; + } + /** + * Returns a range suitable for use in a range-based for loop describing + * the properties of this node. + */ inline property_range properties() { return property_range(*this); } /** * Returns an iterator after the last property of this node. */ inline property_vector::iterator property_begin() { return props.begin(); } /** * Returns an iterator for the first property of this node. */ inline property_vector::iterator property_end() { return props.end(); } /** * Factory method for constructing a new node. Attempts to parse a * node in DTS format from the input, and returns it on success. On * any parse error, this will return 0. This should be called with the * cursor on the open brace of the property, after the name and so on * have been parsed. */ - static node_ptr parse(input_buffer &input, - string name, - string label=string(), - string address=string(), + static node_ptr parse(text_input_buffer &input, + std::string &&name, + std::unordered_set &&label=std::unordered_set(), + std::string &&address=std::string(), define_map *defines=0); /** * Factory method for constructing a new node. Attempts to parse a * node in DTB format from the input, and returns it on success. On * any parse error, this will return 0. This should be called with the * cursor on the open brace of the property, after the name and so on * have been parsed. */ static node_ptr parse_dtb(input_buffer &structs, input_buffer &strings); /** * Returns a property corresponding to the specified key, or 0 if this * node does not contain a property of that name. */ - property_ptr get_property(string key); + property_ptr get_property(const std::string &key); /** * Adds a new property to this node. */ inline void add_property(property_ptr &p) { props.push_back(p); } /** * Merges a node into this one. Any properties present in both are * overridden, any properties present in only one are preserved. */ void merge_node(node_ptr other); /** * Write this node to the specified output. Although nodes do not * refer to a string table directly, their properties do. The string * table passed as the second argument is used for the names of * properties within this node and its children. */ void write(dtb::output_writer &writer, dtb::string_table &strings); /** * Writes the current node as DTS to the specified file. The second * parameter is the indent level. This function will start every line * with this number of tabs. */ void write_dts(FILE *file, int indent); /** * Recursively visit this node and then its children. */ void visit(std::function); }; /** * Class encapsulating the entire parsed FDT. This is the top-level class, * which parses the entire DTS representation and write out the finished * version. */ class device_tree { public: /** * Type used for node paths. A node path is sequence of names and unit * addresses. */ - typedef std::vector > node_path; + typedef std::vector > node_path; /** * Name that we should use for phandle nodes. */ enum phandle_format { /** linux,phandle */ LINUX, /** phandle */ EPAPR, /** Create both nodes. */ BOTH }; private: /** * The format that we should use for writing phandles. */ phandle_format phandle_node_name; /** * Flag indicating that this tree is valid. This will be set to false * on parse errors. */ bool valid; /** * Type used for memory reservations. A reservation is two 64-bit * values indicating a base address and length in memory that the * kernel should not use. The high 32 bits are ignored on 32-bit * platforms. */ typedef std::pair reservation; /** * The memory reserves table. */ std::vector reservations; /** * Root node. All other nodes are children of this node. */ node_ptr root; /** * Mapping from names to nodes. Only unambiguous names are recorded, * duplicate names are stored as (node*)-1. */ - std::unordered_map node_names; + std::unordered_map node_names; /** * A map from labels to node paths. When resolving cross references, * we look up referenced nodes in this and replace the cross reference * with the full path to its target. */ - std::unordered_map node_paths; + std::unordered_map node_paths; /** * A collection of property values that are references to other nodes. * These should be expanded to the full path of their targets. */ std::vector cross_references; /** * A collection of property values that refer to phandles. These will * be replaced by the value of the phandle property in their * destination. */ std::vector phandles; /** * The names of nodes that target phandles. */ - std::unordered_set phandle_targets; + std::unordered_set phandle_targets; /** * A collection of input buffers that we are using. These input * buffers are the ones that own their memory, and so we must preserve * them for the lifetime of the device tree. */ std::vector> buffers; /** * A map of used phandle values to nodes. All phandles must be unique, * so we keep a set of ones that the user explicitly provides in the * input to ensure that we don't reuse them. * * This is a map, rather than a set, because we also want to be able to * find phandles that were provided by the user explicitly when we are * doing checking. */ std::unordered_map used_phandles; /** * Paths to search for include files. This contains a set of * nul-terminated strings, which are not owned by this class and so * must be freed separately. */ std::vector include_paths; /** * Dictionary of predefined macros provided on the command line. */ define_map defines; /** * The default boot CPU, specified in the device tree header. */ uint32_t boot_cpu; /** * The number of empty reserve map entries to generate in the blob. */ uint32_t spare_reserve_map_entries; /** * The minimum size in bytes of the blob. */ uint32_t minimum_blob_size; /** * The number of bytes of padding to add to the end of the blob. */ uint32_t blob_padding; /** * Visit all of the nodes recursively, and if they have labels then add * them to the node_paths and node_names vectors so that they can be * used in resolving cross references. Also collects phandle * properties that have been explicitly added. */ void collect_names_recursive(node_ptr &n, node_path &path); /** * Assign phandle properties to all nodes that have been referenced and * require one. This method will recursively visit the tree starting at * the node that it is passed. */ void assign_phandles(node_ptr &n, uint32_t &next); /** * Calls the recursive version of this method on every root node. */ void collect_names(); /** * Resolves all cross references. Any properties that refer to another * node must have their values replaced by either the node path or * phandle value. */ void resolve_cross_references(); /** - * Parse a top-level include directive. - */ - bool parse_include(input_buffer &input, - const std::string &dir, - std::vector &roots, - FILE *depfile, - bool &read_header); - /** * Parses a dts file in the given buffer and adds the roots to the parsed * set. The `read_header` argument indicates whether the header has * already been read. Some dts files place the header in an include, * rather than in the top-level file. */ - void parse_file(input_buffer &input, - const std::string &dir, + void parse_file(text_input_buffer &input, std::vector &roots, - FILE *depfile, bool &read_header); /** - * Allocates a new mmap()'d input buffer for use in parsing. This - * object then keeps a reference to it, ensuring that it is not - * deallocated until the device tree is destroyed. - */ - input_buffer *buffer_for_file(const char *path, bool warn=true); - /** * Template function that writes a dtb blob using the specified writer. * The writer defines the output format (assembly, blob). */ template void write(int fd); public: /** * Returns the node referenced by the property. If this is a tree that * is in source form, then we have a string that we can use to index * the cross_references array and so we can just look that up. */ node *referenced_node(property_value &v); /** * Writes this FDT as a DTB to the specified output. */ void write_binary(int fd); /** * Writes this FDT as an assembly representation of the DTB to the * specified output. The result can then be assembled and linked into * a program. */ void write_asm(int fd); /** * Writes the tree in DTS (source) format. */ void write_dts(int fd); /** * Default constructor. Creates a valid, but empty FDT. */ device_tree() : phandle_node_name(EPAPR), valid(true), boot_cpu(0), spare_reserve_map_entries(0), minimum_blob_size(0), blob_padding(0) {} /** * Constructs a device tree from the specified file name, referring to * a file that contains a device tree blob. */ - void parse_dtb(const char *fn, FILE *depfile); + void parse_dtb(const std::string &fn, FILE *depfile); /** * Constructs a device tree from the specified file name, referring to * a file that contains device tree source. */ - void parse_dts(const char *fn, FILE *depfile); + void parse_dts(const std::string &fn, FILE *depfile); /** * Returns whether this tree is valid. */ inline bool is_valid() { return valid; } /** * Sets the format for writing phandle properties. */ inline void set_phandle_format(phandle_format f) { phandle_node_name = f; } /** * Returns a pointer to the root node of this tree. No ownership * transfer. */ inline const node_ptr &get_root() const { return root; } /** * Sets the physical boot CPU. */ void set_boot_cpu(uint32_t cpu) { boot_cpu = cpu; } /** * Sorts the tree. Useful for debugging device trees. */ void sort() { root->sort(); } /** * Adds a path to search for include files. The argument must be a * nul-terminated string representing the path. The device tree keeps * a pointer to this string, but does not own it: the caller is * responsible for freeing it if required. */ void add_include_path(const char *path) { std::string p(path); include_paths.push_back(std::move(p)); } /** * Sets the number of empty reserve map entries to add. */ void set_empty_reserve_map_entries(uint32_t e) { spare_reserve_map_entries = e; } /** * Sets the minimum size, in bytes, of the blob. */ void set_blob_minimum_size(uint32_t s) { minimum_blob_size = s; } /** * Sets the amount of padding to add to the blob. */ void set_blob_padding(uint32_t p) { blob_padding = p; } /** * Parses a predefined macro value. */ bool parse_define(const char *def); }; } // namespace fdt } // namespace dtc #endif // !_FDT_HH_ Index: head/usr.bin/dtc/input_buffer.cc =================================================================== --- head/usr.bin/dtc/input_buffer.cc (revision 306805) +++ head/usr.bin/dtc/input_buffer.cc (revision 306806) @@ -1,831 +1,1221 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #include "input_buffer.hh" #include #include #include #include #include #include #include #ifndef NDEBUG #include #endif #include #include #include +#include +#include #ifndef MAP_PREFAULT_READ #define MAP_PREFAULT_READ 0 #endif +using std::string; + +namespace +{ +/** + * Subclass of input_buffer that mmap()s a file and owns the resulting memory. + * When this object is destroyed, the memory is unmapped. + */ +struct mmap_input_buffer : public dtc::input_buffer +{ + string fn; + const string &filename() const override + { + return fn; + } + /** + * Constructs a new buffer from the file passed in as a file + * descriptor. + */ + mmap_input_buffer(int fd, string &&filename); + /** + * Unmaps the buffer, if one exists. + */ + virtual ~mmap_input_buffer(); +}; +/** + * Input buffer read from standard input. This is used for reading device tree + * blobs and source from standard input. It reads the entire input into + * malloc'd memory, so will be very slow for large inputs. DTS and DTB files + * are very rarely more than 10KB though, so this is probably not a problem. + */ +struct stream_input_buffer : public dtc::input_buffer +{ + const string &filename() const override + { + static string n = ""; + return n; + } + /** + * The buffer that will store the data read from the standard input. + */ + std::vector b; + /** + * Constructs a new buffer from the standard input. + */ + stream_input_buffer(); +}; + +mmap_input_buffer::mmap_input_buffer(int fd, std::string &&filename) + : input_buffer(0, 0), fn(filename) +{ + struct stat sb; + if (fstat(fd, &sb)) + { + perror("Failed to stat file"); + } + size = sb.st_size; + buffer = (const char*)mmap(0, size, PROT_READ, MAP_PRIVATE | + MAP_PREFAULT_READ, fd, 0); + if (buffer == MAP_FAILED) + { + perror("Failed to mmap file"); + exit(EXIT_FAILURE); + } +} + +mmap_input_buffer::~mmap_input_buffer() +{ + if (buffer != 0) + { + munmap((void*)buffer, size); + } +} + +stream_input_buffer::stream_input_buffer() : input_buffer(0, 0) +{ + int c; + while ((c = fgetc(stdin)) != EOF) + { + b.push_back(c); + } + buffer = b.data(); + size = b.size(); +} + +} // Anonymous namespace + + namespace dtc { + void -input_buffer::skip_spaces() +input_buffer::skip_to(char c) { - if (cursor >= size) { return; } - if (cursor < 0) { return; } - char c = buffer[cursor]; + while ((cursor < size) && (buffer[cursor] != c)) + { + cursor++; + } +} + +void +text_input_buffer::skip_to(char c) +{ + while (!finished() && (*(*this) != c)) + { + ++(*this); + } +} + +void +text_input_buffer::skip_spaces() +{ + if (finished()) { return; } + char c = *(*this); + bool last_nl = false; while ((c == ' ') || (c == '\t') || (c == '\n') || (c == '\f') || (c == '\v') || (c == '\r')) { - cursor++; - if (cursor > size) + last_nl = ((c == '\n') || (c == '\r')); + ++(*this); + if (finished()) { c = '\0'; } else { - c = buffer[cursor]; + c = *(*this); } } + // Skip C preprocessor leftovers + if ((c == '#') && ((cursor == 0) || last_nl)) + { + skip_to('\n'); + skip_spaces(); + } + if (consume("/include/")) + { + handle_include(); + skip_spaces(); + } } +void +text_input_buffer::handle_include() +{ + bool reallyInclude = true; + if (consume("if ")) + { + next_token(); + string name = parse_property_name(); + if (defines.count(name) > 0) + { + reallyInclude = true; + } + consume('/'); + } + next_token(); + if (!consume('"')) + { + parse_error("Expected quoted filename"); + return; + } + string file = parse_to('"'); + consume('"'); + if (!reallyInclude) + { + return; + } + string include_file = dir + '/' + file; + auto include_buffer = input_buffer::buffer_for_file(include_file, false); + if (include_buffer == 0) + { + for (auto i : include_paths) + { + include_file = i + '/' + file; + include_buffer = input_buffer::buffer_for_file(include_file, false); + if (include_buffer != 0) + { + break; + } + } + } + if (depfile) + { + putc(' ', depfile); + fputs(include_file.c_str(), depfile); + } + if (!include_buffer) + { + parse_error("Unable to locate input file"); + return; + } + input_stack.push(std::move(include_buffer)); +} + input_buffer input_buffer::buffer_from_offset(int offset, int s) { + if (offset < 0) + { + return input_buffer(); + } if (s == 0) { s = size - offset; } if (offset > size) { return input_buffer(); } if (s > (size-offset)) { return input_buffer(); } return input_buffer(&buffer[offset], s); } bool input_buffer::consume(const char *str) { int len = strlen(str); if (len > size - cursor) { return false; } else { for (int i=0 ; i(&buffer[size]); outInt = strtoull(&buffer[cursor], &end, 0); if (end == &buffer[cursor]) { return false; } cursor = end - buffer; return true; } namespace { /** * Convenience typedef for the type that we use for all values. */ typedef unsigned long long valty; /** * Expression tree currently being parsed. */ struct expression { + typedef text_input_buffer::source_location source_location; /** + * The type that is returned when computing the result. The boolean value + * indicates whether this is a valid expression. + * + * FIXME: Once we can use C++17, this should be `std::optional`. + */ + typedef std::pair result; + /** * Evaluate this node, taking into account operator precedence. */ - virtual valty operator()() = 0; + virtual result operator()() = 0; /** * Returns the precedence of this node. Lower values indicate higher * precedence. */ virtual int precedence() = 0; + /** + * Constructs an expression, storing the location where it was created. + */ + expression(source_location l) : loc(l) {} virtual ~expression() {} #ifndef NDEBUG /** * Dumps this expression to `std::cerr`, appending a newline if `nl` is * `true`. */ void dump(bool nl=false) { - if (this == nullptr) + void *ptr = this; + if (ptr == nullptr) { std::cerr << "{nullptr}\n"; return; } dump_impl(); if (nl) { std::cerr << '\n'; } } private: /** * Method that sublcasses override to implement the behaviour of `dump()`. */ virtual void dump_impl() = 0; #endif + protected: + source_location loc; }; /** * Expression wrapping a single integer. Leaf nodes in the expression tree. */ class terminal_expr : public expression { /** * The value that this wraps. */ valty val; /** * Evaluate. Trivially returns the value that this class wraps. */ - valty operator()() override + result operator()() override { - return val; + return {val, true}; } int precedence() override { return 0; } public: /** * Constructor. */ - terminal_expr(valty v) : val(v) {} + terminal_expr(source_location l, valty v) : expression(l), val(v) {} #ifndef NDEBUG void dump_impl() override { std::cerr << val; } #endif }; /** * Parenthetical expression. Exists to make the contents opaque. */ struct paren_expression : public expression { /** * The expression within the parentheses. */ expression_ptr subexpr; /** * Constructor. Takes the child expression as the only argument. */ - paren_expression(expression_ptr p) : subexpr(std::move(p)) {} + paren_expression(source_location l, expression_ptr p) : expression(l), + subexpr(std::move(p)) {} int precedence() override { return 0; } /** * Evaluate - just forwards to the underlying expression. */ - valty operator()() override + result operator()() override { return (*subexpr)(); } #ifndef NDEBUG void dump_impl() override { std::cerr << " ("; subexpr->dump(); std::cerr << ") "; } #endif }; /** * Template class for unary operators. The `OpChar` template parameter is * solely for debugging and makes it easy to print the expression. The `Op` * template parameter is a function object that implements the operator that * this class provides. Most of these are provided by the `` * header. */ template class unary_operator : public expression { /** * The subexpression for this unary operator. */ expression_ptr subexpr; - valty operator()() override + result operator()() override { Op op; - return op((*subexpr)()); + result s = (*subexpr)(); + if (!s.second) + { + return s; + } + return {op(s.first), true}; } /** * All unary operators have the same precedence. They are all evaluated * before binary expressions, but after parentheses. */ int precedence() override { return 3; } public: - unary_operator(expression_ptr p) : subexpr(std::move(p)) {} + unary_operator(source_location l, expression_ptr p) : + expression(l), subexpr(std::move(p)) {} #ifndef NDEBUG void dump_impl() override { std::cerr << OpChar; subexpr->dump(); } #endif }; /** * Abstract base class for binary operators. Allows the tree to be modified * without knowing what the operations actually are. */ struct binary_operator_base : public expression { + using expression::expression; /** * The left side of the expression. */ expression_ptr lhs; /** * The right side of the expression. */ expression_ptr rhs; /** * Insert a node somewhere down the path of left children, until it would * be preempting something that should execute first. */ void insert_left(binary_operator_base *new_left) { if (lhs->precedence() < new_left->precedence()) { new_left->rhs = std::move(lhs); lhs.reset(new_left); } else { static_cast(lhs.get())->insert_left(new_left); } } }; /** * Template class for binary operators. The precedence and the operation are * provided as template parameters. */ template struct binary_operator : public binary_operator_base { - valty operator()() override + result operator()() override { Op op; - return op((*lhs)(), (*rhs)()); + result l = (*lhs)(); + result r = (*rhs)(); + if (!(l.second && r.second)) + { + return {0, false}; + } + return {op(l.first, r.first), true}; } int precedence() override { return Precedence; } #ifdef NDEBUG /** * Constructor. Takes the name of the operator as an argument, for * debugging. Only stores it in debug mode. */ - binary_operator(const char *) {} + binary_operator(source_location l, const char *) : expression(l) {} #else const char *opName; - binary_operator(const char *o) : opName(o) {} + binary_operator(source_location l, const char *o) : + binary_operator_base(l), opName(o) {} void dump_impl() override { lhs->dump(); std::cerr << opName; rhs->dump(); } #endif }; /** * Ternary conditional operators (`cond ? true : false`) are a special case - * there are no other ternary operators. */ class ternary_conditional_operator : public expression { /** * The condition for the clause. */ expression_ptr cond; /** * The expression that this evaluates to if the condition is true. */ expression_ptr lhs; /** * The expression that this evaluates to if the condition is false. */ expression_ptr rhs; - valty operator()() override + result operator()() override { - return (*cond)() ? (*lhs)() : (*rhs)(); + result c = (*cond)(); + result l = (*lhs)(); + result r = (*rhs)(); + if (!(l.second && r.second && c.second)) + { + return {0, false}; + } + return c.first ? l : r; } int precedence() override { // The actual precedence of a ternary conditional operator is 15, but // its associativity is the opposite way around to the other operators, // so we fudge it slightly. return 3; } #ifndef NDEBUG void dump_impl() override { cond->dump(); std::cerr << " ? "; lhs->dump(); std::cerr << " : "; rhs->dump(); } #endif public: - ternary_conditional_operator(expression_ptr c, + ternary_conditional_operator(source_location sl, + expression_ptr c, expression_ptr l, expression_ptr r) : - cond(std::move(c)), lhs(std::move(l)), rhs(std::move(r)) {} + expression(sl), cond(std::move(c)), lhs(std::move(l)), + rhs(std::move(r)) {} }; template struct lshift { constexpr T operator()(const T &lhs, const T &rhs) const { return lhs << rhs; } }; template struct rshift { constexpr T operator()(const T &lhs, const T &rhs) const { return lhs >> rhs; } }; template struct unary_plus { constexpr T operator()(const T &val) const { return +val; } }; // TODO: Replace with std::bit_not once we can guarantee C++14 as a baseline. template struct bit_not { constexpr T operator()(const T &val) const { return ~val; } }; +template +struct divmod : public binary_operator<5, T> +{ + using binary_operator<5, T>::binary_operator; + using binary_operator_base::result; + result operator()() override + { + result r = (*binary_operator_base::rhs)(); + if (r.second && (r.first == 0)) + { + expression::loc.report_error("Division by zero"); + return {0, false}; + } + return binary_operator<5, T>::operator()(); + } +}; + } // anonymous namespace -expression_ptr input_buffer::parse_binary_expression(expression_ptr lhs) +expression_ptr text_input_buffer::parse_binary_expression(expression_ptr lhs) { next_token(); binary_operator_base *expr = nullptr; - char op = ((*this)[0]); + char op = *(*this); + source_location l = location(); switch (op) { default: return lhs; case '+': - expr = new binary_operator<6, std::plus>("+"); + expr = new binary_operator<6, std::plus>(l, "+"); break; case '-': - expr = new binary_operator<6, std::minus>("-"); + expr = new binary_operator<6, std::minus>(l, "-"); break; case '%': - expr = new binary_operator<5, std::modulus>("%"); + expr = new divmod>(l, "/"); break; case '*': - expr = new binary_operator<5, std::multiplies>("*"); + expr = new binary_operator<5, std::multiplies>(l, "*"); break; case '/': - expr = new binary_operator<5, std::divides>("/"); + expr = new divmod>(l, "/"); break; case '<': - cursor++; - switch ((*this)[0]) + switch (peek()) { default: parse_error("Invalid operator"); return nullptr; case ' ': case '(': case '0'...'9': - cursor--; - expr = new binary_operator<8, std::less>("<"); + expr = new binary_operator<8, std::less>(l, "<"); break; case '=': - expr = new binary_operator<8, std::less_equal>("<="); + ++(*this); + expr = new binary_operator<8, std::less_equal>(l, "<="); break; case '<': - expr = new binary_operator<7, lshift>("<<"); + ++(*this); + expr = new binary_operator<7, lshift>(l, "<<"); break; } break; case '>': - cursor++; - switch ((*this)[0]) + switch (peek()) { default: parse_error("Invalid operator"); return nullptr; case '(': case ' ': case '0'...'9': - cursor--; - expr = new binary_operator<8, std::greater>(">"); + expr = new binary_operator<8, std::greater>(l, ">"); break; case '=': - expr = new binary_operator<8, std::greater_equal>(">="); + ++(*this); + expr = new binary_operator<8, std::greater_equal>(l, ">="); break; case '>': - expr = new binary_operator<7, rshift>(">>"); + ++(*this); + expr = new binary_operator<7, rshift>(l, ">>"); break; return lhs; } break; case '=': - if ((*this)[1] != '=') + if (peek() != '=') { parse_error("Invalid operator"); return nullptr; } - consume('='); - expr = new binary_operator<9, std::equal_to>("=="); + expr = new binary_operator<9, std::equal_to>(l, "=="); break; case '!': - if ((*this)[1] != '=') + if (peek() != '=') { parse_error("Invalid operator"); return nullptr; } cursor++; - expr = new binary_operator<9, std::not_equal_to>("!="); + expr = new binary_operator<9, std::not_equal_to>(l, "!="); break; case '&': - if ((*this)[1] == '&') + if (peek() == '&') { - expr = new binary_operator<13, std::logical_and>("&&"); + expr = new binary_operator<13, std::logical_and>(l, "&&"); } else { - expr = new binary_operator<10, std::bit_and>("&"); + expr = new binary_operator<10, std::bit_and>(l, "&"); } break; case '|': - if ((*this)[1] == '|') + if (peek() == '|') { - expr = new binary_operator<12, std::logical_or>("||"); + expr = new binary_operator<12, std::logical_or>(l, "||"); } else { - expr = new binary_operator<14, std::bit_or>("|"); + expr = new binary_operator<14, std::bit_or>(l, "|"); } break; case '?': { consume('?'); expression_ptr true_case = parse_expression(); next_token(); if (!true_case || !consume(':')) { parse_error("Expected : in ternary conditional operator"); return nullptr; } expression_ptr false_case = parse_expression(); if (!false_case) { parse_error("Expected false condition for ternary operator"); return nullptr; } - return expression_ptr(new ternary_conditional_operator(std::move(lhs), + return expression_ptr(new ternary_conditional_operator(l, std::move(lhs), std::move(true_case), std::move(false_case))); } } - cursor++; + ++(*this); next_token(); expression_ptr e(expr); expression_ptr rhs(parse_expression()); if (!rhs) { return nullptr; } expr->lhs = std::move(lhs); if (rhs->precedence() < expr->precedence()) { expr->rhs = std::move(rhs); } else { // If we're a normal left-to-right expression, then we need to insert // this as the far-left child node of the rhs expression binary_operator_base *rhs_op = static_cast(rhs.get()); rhs_op->insert_left(expr); e.release(); return rhs; } return e; } -expression_ptr input_buffer::parse_expression(bool stopAtParen) +expression_ptr text_input_buffer::parse_expression(bool stopAtParen) { next_token(); unsigned long long leftVal; expression_ptr lhs; - switch ((*this)[0]) + source_location l = location(); + switch (*(*this)) { case '0'...'9': if (!consume_integer(leftVal)) { return nullptr; } - lhs.reset(new terminal_expr(leftVal)); + lhs.reset(new terminal_expr(l, leftVal)); break; case '(': { consume('('); expression_ptr &&subexpr = parse_expression(); if (!subexpr) { return nullptr; } - lhs.reset(new paren_expression(std::move(subexpr))); + lhs.reset(new paren_expression(l, std::move(subexpr))); if (!consume(')')) { return nullptr; } if (stopAtParen) { return lhs; } break; } case '+': { consume('+'); expression_ptr &&subexpr = parse_expression(); if (!subexpr) { return nullptr; } - lhs.reset(new unary_operator<'+', unary_plus>(std::move(subexpr))); + lhs.reset(new unary_operator<'+', unary_plus>(l, std::move(subexpr))); break; } case '-': { consume('-'); expression_ptr &&subexpr = parse_expression(); if (!subexpr) { return nullptr; } - lhs.reset(new unary_operator<'-', std::negate>(std::move(subexpr))); + lhs.reset(new unary_operator<'-', std::negate>(l, std::move(subexpr))); break; } case '!': { consume('!'); expression_ptr &&subexpr = parse_expression(); if (!subexpr) { return nullptr; } - lhs.reset(new unary_operator<'!', std::logical_not>(std::move(subexpr))); + lhs.reset(new unary_operator<'!', std::logical_not>(l, std::move(subexpr))); break; } case '~': { consume('~'); expression_ptr &&subexpr = parse_expression(); if (!subexpr) { return nullptr; } - lhs.reset(new unary_operator<'~', bit_not>(std::move(subexpr))); + lhs.reset(new unary_operator<'~', bit_not>(l, std::move(subexpr))); break; } } if (!lhs) { return nullptr; } return parse_binary_expression(std::move(lhs)); } bool -input_buffer::consume_integer_expression(unsigned long long &outInt) +text_input_buffer::consume_integer_expression(unsigned long long &outInt) { - switch ((*this)[0]) + switch (*(*this)) { case '(': { expression_ptr e(parse_expression(true)); if (!e) { return false; } - outInt = (*e)(); - return true; + auto r = (*e)(); + if (r.second) + { + outInt = r.first; + return true; + } + return false; } case '0'...'9': return consume_integer(outInt); default: return false; } } bool input_buffer::consume_hex_byte(uint8_t &outByte) { if (!ishexdigit((*this)[0]) && !ishexdigit((*this)[1])) { return false; } outByte = (digittoint((*this)[0]) << 4) | digittoint((*this)[1]); cursor += 2; return true; } -input_buffer& -input_buffer::next_token() +text_input_buffer& +text_input_buffer::next_token() { + auto &self = *this; int start; do { start = cursor; skip_spaces(); + if (finished()) + { + return self; + } // Parse /* comments - if ((*this)[0] == '/' && (*this)[1] == '*') + if (*self == '/' && peek() == '*') { // eat the start of the comment - ++(*this); - ++(*this); + ++self; + ++self; do { // Find the ending * of */ - while ((**this != '\0') && (**this != '*')) + while ((*self != '\0') && (*self != '*') && !finished()) { - ++(*this); + ++self; } // Eat the * - ++(*this); - } while ((**this != '\0') && (**this != '/')); + ++self; + } while ((*self != '\0') && (*self != '/') && !finished()); // Eat the / - ++(*this); + ++self; } // Parse // comments - if (((*this)[0] == '/' && (*this)[1] == '/')) + if ((*self == '/' && peek() == '/')) { // eat the start of the comment - ++(*this); - ++(*this); + ++self; + ++self; // Find the ending of the line - while (**this != '\n') + while (*self != '\n' && !finished()) { - ++(*this); + ++self; } // Eat the \n - ++(*this); + ++self; } } while (start != cursor); - return *this; + return self; } void -input_buffer::parse_error(const char *msg) +text_input_buffer::parse_error(const char *msg) { + if (input_stack.empty()) + { + fprintf(stderr, "Error: %s\n", msg); + return; + } + input_buffer &b = *input_stack.top(); + parse_error(msg, b, b.cursor); +} +void +text_input_buffer::parse_error(const char *msg, + input_buffer &b, + int loc) +{ int line_count = 1; int line_start = 0; - int line_end = cursor; - for (int i=cursor ; i>0 ; --i) + int line_end = loc; + if (loc < 0 || loc > b.size) { - if (buffer[i] == '\n') + return; + } + for (int i=loc ; i>0 ; --i) + { + if (b.buffer[i] == '\n') { line_count++; if (line_start == 0) { line_start = i+1; } } } - for (int i=cursor+1 ; i= 'a') && (c <= 'z')) || ((c >= 'A') && + (c <= 'Z')); } - size = sb.st_size; - buffer = (const char*)mmap(0, size, PROT_READ, MAP_PRIVATE | - MAP_PREFAULT_READ, fd, 0); - if (buffer == MAP_FAILED) +}; +/** + * Check whether a character is in the set allowed for node names. This is a + * class so that it can be used with a template function for parsing strings. + */ +struct is_node_name_character +{ + static inline bool check(const char c) { - perror("Failed to mmap file"); - exit(EXIT_FAILURE); + switch(c) + { + default: + return false; + case 'a'...'z': case 'A'...'Z': case '0'...'9': + case ',': case '.': case '+': case '-': + case '_': + return true; + } } +}; +/** + * Check whether a character is in the set allowed for property names. This is + * a class so that it can be used with a template function for parsing strings. + */ +struct is_property_name_character +{ + static inline bool check(const char c) + { + switch(c) + { + default: + return false; + case 'a'...'z': case 'A'...'Z': case '0'...'9': + case ',': case '.': case '+': case '-': + case '_': case '#': + return true; + } + } +}; + +template +string parse(text_input_buffer &s) +{ + std::vector bytes; + for (char c=*s ; T::check(c) ; c=*(++s)) + { + bytes.push_back(c); + } + return string(bytes.begin(), bytes.end()); } -mmap_input_buffer::~mmap_input_buffer() +} + +string +text_input_buffer::parse_node_name() { - if (buffer != 0) + return parse(*this); +} + +string +text_input_buffer::parse_property_name() +{ + return parse(*this); +} + +string +text_input_buffer::parse_node_or_property_name(bool &is_property) +{ + if (is_property) { - munmap((void*)buffer, size); + return parse_property_name(); } + std::vector bytes; + for (char c=*(*this) ; is_node_name_character::check(c) ; c=*(++(*this))) + { + bytes.push_back(c); + } + for (char c=*(*this) ; is_property_name_character::check(c) ; c=*(++(*this))) + { + bytes.push_back(c); + is_property = true; + } + return string(bytes.begin(), bytes.end()); } -stream_input_buffer::stream_input_buffer() : input_buffer(0, 0) +string +input_buffer::parse_to(char stop) { - int c; - while ((c = fgetc(stdin)) != EOF) + std::vector bytes; + for (char c=*(*this) ; c != stop ; c=*(++(*this))) { - b.push_back(c); + bytes.push_back(c); } - buffer = b.data(); - size = b.size(); + return string(bytes.begin(), bytes.end()); +} + +string +text_input_buffer::parse_to(char stop) +{ + std::vector bytes; + for (char c=*(*this) ; c != stop ; c=*(++(*this))) + { + if (finished()) + { + break; + } + bytes.push_back(c); + } + return string(bytes.begin(), bytes.end()); +} + +char +text_input_buffer::peek() +{ + return (*input_stack.top())[1]; +} + +std::unique_ptr +input_buffer::buffer_for_file(const string &path, bool warn) +{ + if (path == "-") + { + std::unique_ptr b(new stream_input_buffer()); + return b; + } + int source = open(path.c_str(), O_RDONLY); + if (source == -1) + { + if (warn) + { + fprintf(stderr, "Unable to open file '%s'. %s\n", path.c_str(), strerror(errno)); + } + return 0; + } + struct stat st; + if (fstat(source, &st) == 0 && S_ISDIR(st.st_mode)) + { + if (warn) + { + fprintf(stderr, "File %s is a directory\n", path.c_str()); + } + close(source); + return 0; + } + std::unique_ptr b(new mmap_input_buffer(source, std::string(path))); + close(source); + return b; } } // namespace dtc Index: head/usr.bin/dtc/input_buffer.hh =================================================================== --- head/usr.bin/dtc/input_buffer.hh (revision 306805) +++ head/usr.bin/dtc/input_buffer.hh (revision 306806) @@ -1,316 +1,537 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _INPUT_BUFFER_HH_ #define _INPUT_BUFFER_HH_ #include "util.hh" #include +#include +#include +#include namespace dtc { namespace { struct expression; typedef std::unique_ptr expression_ptr; } /** * Class encapsulating the input file. Can be used as a const char*, but has * range checking. Attempting to access anything out of range will return a 0 * byte. The input buffer can be cheaply copied, without copying the * underlying memory, however it is the user's responsibility to ensure that * such copies do not persist beyond the lifetime of the underlying memory. * * This also contains methods for reporting errors and for consuming the token * stream. */ class input_buffer { + friend class text_input_buffer; protected: /** * The buffer. This class doesn't own the buffer, but the * mmap_input_buffer subclass does. */ const char* buffer; /** * The size of the buffer. */ int size; private: /** - * Parse an expression. If `stopAtParen` is set, then only parse a number - * or a parenthetical expression, otherwise assume that either is the - * left-hand side of a binary expression and try to parse the right-hand - * side. - */ - expression_ptr parse_expression(bool stopAtParen=false); - /** - * Parse a binary expression, having already parsed the right-hand side. - */ - expression_ptr parse_binary_expression(expression_ptr lhs); - /** * The current place in the buffer where we are reading. This class * keeps a separate size, pointer, and cursor so that we can move * forwards and backwards and still have checks that we haven't fallen * off either end. */ int cursor; /** * Private constructor. This is used to create input buffers that * refer to the same memory, but have different cursors. */ input_buffer(const char* b, int s, int c) : buffer(b), size(s), cursor(c) {} + public: /** - * Reads forward past any spaces. The DTS format is not whitespace - * sensitive and so we want to scan past whitespace when reading it. + * Returns the file name associated with this buffer. */ - void skip_spaces(); - public: + virtual const std::string &filename() const + { + static std::string s; + return s; + } + static std::unique_ptr buffer_for_file(const std::string &path, + bool warn=true); /** + * Skips all characters in the input until the specified character is + * encountered. + */ + void skip_to(char); + /** + * Parses up to a specified character and returns the intervening + * characters as a string. + */ + std::string parse_to(char); + /** * Return whether all input has been consumed. */ bool finished() { return cursor >= size; } /** * Virtual destructor. Does nothing, but exists so that subclasses * that own the memory can run cleanup code for deallocating it. */ virtual ~input_buffer() {}; /** * Constructs an empty buffer. */ input_buffer() : buffer(0), size(0), cursor(0) {} /** * Constructs a new buffer with a specified memory region and size. */ input_buffer(const char* b, int s) : buffer(b), size(s), cursor(0){} /** * Returns a new input buffer referring into this input, clamped to the * specified size. If the requested buffer would fall outside the * range of this one, then it returns an empty buffer. * * The returned buffer shares the same underlying storage as the * original. This is intended to be used for splitting up the various * sections of a device tree blob. Requesting a size of 0 will give a * buffer that extends to the end of the available memory. */ input_buffer buffer_from_offset(int offset, int s=0); /** - * Returns true if this buffer has no unconsumed space in it. - */ - inline bool empty() - { - return cursor >= size; - } - /** * Dereferencing operator, allows the buffer to be treated as a char* * and dereferenced to give a character. This returns a null byte if * the cursor is out of range. */ inline char operator*() { if (cursor >= size) { return '\0'; } if (cursor < 0) { return '\0'; } return buffer[cursor]; } /** * Array subscripting operator, returns a character at the specified * index offset from the current cursor. The offset may be negative, * to reread characters that have already been read. If the current * cursor plus offset is outside of the range, this returns a nul * byte. */ inline char operator[](int offset) { if (cursor + offset >= size) { return '\0'; } if (cursor + offset < 0) { return '\0'; } return buffer[cursor + offset]; } /** * Increments the cursor, iterating forward in the buffer. */ inline input_buffer &operator++() { cursor++; return *this; } /** - * Cast to char* operator. Returns a pointer into the buffer that can - * be used for constructing strings. - */ - inline operator const char*() - { - if (cursor >= size) { return 0; } - if (cursor < 0) { return 0; } - return &buffer[cursor]; - } - /** * Consumes a character. Moves the cursor one character forward if the * next character matches the argument, returning true. If the current * character does not match the argument, returns false. */ inline bool consume(char c) { - if ((*this)[0] == c) + if (*(*this) == c) { ++(*this); return true; } return false; } /** * Consumes a string. If the (null-terminated) string passed as the * argument appears in the input, advances the cursor to the end and * returns true. Returns false if the string does not appear at the * current point in the input. */ bool consume(const char *str); /** * Reads an integer in base 8, 10, or 16. Returns true and advances * the cursor to the end of the integer if the cursor points to an * integer, returns false and does not move the cursor otherwise. * * The parsed value is returned via the argument. */ bool consume_integer(unsigned long long &outInt); /** * Reads an arithmetic expression (containing any of the normal C * operators), evaluates it, and returns the result. */ bool consume_integer_expression(unsigned long long &outInt); /** + * Consumes two hex digits and return the resulting byte via the first + * argument. If the next two characters are hex digits, returns true + * and advances the cursor. If not, then returns false and leaves the + * cursor in place. + */ + bool consume_hex_byte(uint8_t &outByte); + /** * Template function that consumes a binary value in big-endian format * from the input stream. Returns true and advances the cursor if * there is a value of the correct size. This function assumes that * all values must be natively aligned, and so advances the cursor to * the correct alignment before reading. */ template bool consume_binary(T &out) { int align = 0; int type_size = sizeof(T); if (cursor % type_size != 0) { align = type_size - (cursor % type_size); } if (size < cursor + align + type_size) { return false; } cursor += align; assert(cursor % type_size == 0); out = 0; for (int i=0 ; i inline bool input_buffer::consume_binary(uint8_t &out) { if (size < cursor + 1) { return false; } out = buffer[cursor++]; return true; } /** - * Subclass of input_buffer that mmap()s a file and owns the resulting memory. - * When this object is destroyed, the memory is unmapped. + * An input buffer subclass used for parsing DTS files. This manages a stack + * of input buffers to handle /input/ operations. */ -struct mmap_input_buffer : public input_buffer +class text_input_buffer { + std::unordered_set defines; /** - * Constructs a new buffer from the file passed in as a file - * descriptor. + * The cursor is the input into the input stream where we are currently reading. */ - mmap_input_buffer(int fd); + int cursor = 0; /** - * Unmaps the buffer, if one exists. + * The current stack of includes. The current input is always from the top + * of the stack. */ - virtual ~mmap_input_buffer(); -}; -/** - * Input buffer read from standard input. This is used for reading device tree - * blobs and source from standard input. It reads the entire input into - * malloc'd memory, so will be very slow for large inputs. DTS and DTB files - * are very rarely more than 10KB though, so this is probably not a problem. - */ -struct stream_input_buffer : public input_buffer -{ + std::stack> input_stack; /** - * The buffer that will store the data read from the standard input. + * */ - std::vector b; + const std::vector include_paths; /** - * Constructs a new buffer from the standard input. + * Reads forward past any spaces. The DTS format is not whitespace + * sensitive and so we want to scan past whitespace when reading it. */ - stream_input_buffer(); + void skip_spaces(); + /** + * Returns the character immediately after the current one. + * + * This method does not look between files. + */ + char peek(); + /** + * If a /include/ token is encountered, then look up the corresponding + * input file, push it onto the input stack, and continue. + */ + void handle_include(); + /** + * The base directory for this file. + */ + const std::string dir; + /** + * The file where dependencies should be output. + */ + FILE *depfile; + public: + /** + * Construct a new text input buffer with the specified buffer as the start + * of parsing and the specified set of input paths for handling new + * inclusions. + */ + text_input_buffer(std::unique_ptr &&b, + std::unordered_set &&d, + std::vector &&i, + const std::string directory, + FILE *deps) + : defines(d), include_paths(i), dir(directory), depfile(deps) + { + input_stack.push(std::move(b)); + } + /** + * Skips all characters in the input until the specified character is + * encountered. + */ + void skip_to(char); + /** + * Parse an expression. If `stopAtParen` is set, then only parse a number + * or a parenthetical expression, otherwise assume that either is the + * left-hand side of a binary expression and try to parse the right-hand + * side. + */ + expression_ptr parse_expression(bool stopAtParen=false); + /** + * Parse a binary expression, having already parsed the right-hand side. + */ + expression_ptr parse_binary_expression(expression_ptr lhs); + /** + * Return whether all input has been consumed. + */ + bool finished() + { + return input_stack.empty() || + ((input_stack.size() == 1) && input_stack.top()->finished()); + } + /** + * Dereferencing operator. Returns the current character in the top input buffer. + */ + inline char operator*() + { + if (input_stack.empty()) + { + return 0; + } + return *(*input_stack.top()); + } + /** + * Increments the cursor, iterating forward in the buffer. + */ + inline text_input_buffer &operator++() + { + if (input_stack.empty()) + { + return *this; + } + cursor++; + auto &top = *input_stack.top(); + ++top; + if (top.finished()) + { + input_stack.pop(); + } + return *this; + } + /** + * Consumes a character. Moves the cursor one character forward if the + * next character matches the argument, returning true. If the current + * character does not match the argument, returns false. + */ + inline bool consume(char c) + { + if (*(*this) == c) + { + ++(*this); + return true; + } + return false; + } + /** + * Consumes a string. If the (null-terminated) string passed as the + * argument appears in the input, advances the cursor to the end and + * returns true. Returns false if the string does not appear at the + * current point in the input. + * + * This method does not scan between files. + */ + bool consume(const char *str) + { + if (input_stack.empty()) + { + return false; + } + return input_stack.top()->consume(str); + } + /** + * Reads an integer in base 8, 10, or 16. Returns true and advances + * the cursor to the end of the integer if the cursor points to an + * integer, returns false and does not move the cursor otherwise. + * + * The parsed value is returned via the argument. + * + * This method does not scan between files. + */ + bool consume_integer(unsigned long long &outInt) + { + if (input_stack.empty()) + { + return false; + } + return input_stack.top()->consume_integer(outInt); + } + /** + * Reads an arithmetic expression (containing any of the normal C + * operators), evaluates it, and returns the result. + */ + bool consume_integer_expression(unsigned long long &outInt); + /** + * Consumes two hex digits and return the resulting byte via the first + * argument. If the next two characters are hex digits, returns true + * and advances the cursor. If not, then returns false and leaves the + * cursor in place. + * + * This method does not scan between files. + */ + bool consume_hex_byte(uint8_t &outByte) + { + if (input_stack.empty()) + { + return false; + } + return input_stack.top()->consume_hex_byte(outByte); + } + /** + * Returns the longest string in the input buffer starting at the + * current cursor and composed entirely of characters that are valid in + * node names. + */ + std::string parse_node_name(); + /** + * Returns the longest string in the input buffer starting at the + * current cursor and composed entirely of characters that are valid in + * property names. + */ + std::string parse_property_name(); + /** + * Parses either a node or a property name. If is_property is true on + * entry, then only property names are parsed. If it is false, then it + * will be set, on return, to indicate whether the parsed name is only + * valid as a property. + */ + std::string parse_node_or_property_name(bool &is_property); + /** + * Parses up to a specified character and returns the intervening + * characters as a string. + */ + std::string parse_to(char); + /** + * Advances the cursor to the start of the next token, skipping + * comments and whitespace. If the cursor already points to the start + * of a token, then this function does nothing. + */ + text_input_buffer &next_token(); + /** + * Location in the source file. This should never be interpreted by + * anything other than error reporting functions of this class. It will + * eventually become something more complex than an `int`. + */ + class source_location + { + friend class text_input_buffer; + /** + * The text buffer object that included `b`. + */ + text_input_buffer &buffer; + /** + * The underlying buffer that contains this location. + */ + std::shared_ptr b; + /** + * The offset within the current buffer of the source location. + */ + int cursor; + source_location(text_input_buffer &buf) + : buffer(buf), + b(buf.input_stack.empty() ? nullptr : buf.input_stack.top()), + cursor(b ? b->cursor : 0) {} + public: + /** + * Report an error at this location. + */ + void report_error(const char *msg) + { + if (b) + { + buffer.parse_error(msg, *b, cursor); + } + else + { + buffer.parse_error(msg); + } + } + }; + /** + * Returns the current source location. + */ + source_location location() + { + return { *this }; + } + /** + * Prints a message indicating the location of a parse error. + */ + void parse_error(const char *msg); + private: + /** + * Prints a message indicating the location of a parse error, given a + * specified location. This is used when input has already moved beyond + * the location that caused the failure. + */ + void parse_error(const char *msg, input_buffer &b, int loc); }; } // namespace dtc #endif // !_INPUT_BUFFER_HH_ Index: head/usr.bin/dtc/string.cc =================================================================== --- head/usr.bin/dtc/string.cc (revision 306805) +++ head/usr.bin/dtc/string.cc (revision 306806) @@ -1,258 +1,148 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ -#include "string.hh" +#include +#include +#include #include -#include +#include -namespace -{ -/** - * The source files are ASCII, so we provide a non-locale-aware version of - * isalpha. This is a class so that it can be used with a template function - * for parsing strings. - */ -struct is_alpha -{ - static inline bool check(const char c) - { - return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && - (c <= 'Z')); - } -}; -/** - * Check whether a character is in the set allowed for node names. This is a - * class so that it can be used with a template function for parsing strings. - */ -struct is_node_name_character -{ - static inline bool check(const char c) - { - switch(c) - { - default: - return false; - case 'a'...'z': case 'A'...'Z': case '0'...'9': - case ',': case '.': case '+': case '-': - case '_': - return true; - } - } -}; -/** - * Check whether a character is in the set allowed for property names. This is - * a class so that it can be used with a template function for parsing strings. - */ -struct is_property_name_character -{ - static inline bool check(const char c) - { - switch(c) - { - default: - return false; - case 'a'...'z': case 'A'...'Z': case '0'...'9': - case ',': case '.': case '+': case '-': - case '_': case '#': - return true; - } - } -}; +#include "util.hh" -} +using std::string; namespace dtc { -template string -string::parse(input_buffer &s) -{ - const char *start = s; - int l=0; - while (T::check(*s)) { l++; ++s; } - return string(start, l); -} - -string::string(input_buffer &s) : start((const char*)s), length(0) -{ - while(s[length] != '\0') - { - length++; - } -} - -string -string::parse_node_name(input_buffer &s) -{ - return parse(s); -} - -string -string::parse_property_name(input_buffer &s) -{ - return parse(s); -} -string -string::parse_node_or_property_name(input_buffer &s, bool &is_property) -{ - if (is_property) - { - return parse_property_name(s); - } - const char *start = s; - int l=0; - while (is_node_name_character::check(*s)) - { - l++; - ++s; - } - while (is_property_name_character::check(*s)) - { - l++; - ++s; - is_property = true; - } - return string(start, l); -} - -bool -string::operator==(const string& other) const -{ - return (length == other.length) && - (memcmp(start, other.start, length) == 0); -} - -bool -string::operator==(const char *other) const -{ - return strncmp(other, start, length) == 0; -} - -bool -string::operator<(const string& other) const -{ - if (length < other.length) { return true; } - if (length > other.length) { return false; } - return memcmp(start, other.start, length) < 0; -} - void -string::push_to_buffer(byte_buffer &buffer, bool escapes) +push_string(byte_buffer &buffer, const string &s, bool escapes) { - for (int i=0 ; i= '0') + if (i+1 < length && s[i+1] <= '7' && s[i+1] >= '0') { v <<= 3; - v |= digittoint(start[i+1]); + v |= digittoint(s[i+1]); i++; - if (i+1 < length && start[i+1] <= '7' && start[i+1] >= '0') + if (i+1 < length && s[i+1] <= '7' && s[i+1] >= '0') { v <<= 3; - v |= digittoint(start[i+1]); + v |= digittoint(s[i+1]); } } c = (uint8_t)v; break; } case 'x': { ++i; if (i >= length) { break; } - int v = digittoint(start[i]); - if (i+1 < length && ishexdigit(start[i+1])) + int v = digittoint(s[i]); + if (i+1 < length && ishexdigit(s[i+1])) { v <<= 4; - v |= digittoint(start[++i]); + v |= digittoint(s[++i]); } c = (uint8_t)v; break; } } } buffer.push_back(c); } } -void -string::print(FILE *file) +std::string dirname(const string &s) { - fwrite(start, length, 1, file); + if (s == string()) + { + return string(); + } + char *str = strdup(s.c_str()); + string dn(::dirname(str)); + free(str); + return dn; } -void -string::dump() +std::string basename(const string &s) { - print(stderr); + if (s == string()) + { + return string(); + } + char *str = strdup(s.c_str()); + string bn(::basename(str)); + free(str); + return bn; } - } // namespace dtc Index: head/usr.bin/dtc/util.hh =================================================================== --- head/usr.bin/dtc/util.hh (revision 306805) +++ head/usr.bin/dtc/util.hh (revision 306806) @@ -1,92 +1,115 @@ /*- * Copyright (c) 2013 David Chisnall * All rights reserved. * * This software was developed by SRI International and the University of * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237) * ("CTSRD"), as part of the DARPA CRASH research programme. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _UTIL_HH_ #define _UTIL_HH_ #include // If we aren't using C++11, then just ignore static asserts. #if __cplusplus < 201103L #ifndef static_assert #define static_assert(x, y) ((void)0) #endif #endif namespace dtc { /** * Type for a buffer of bytes. This is used for a lot of short-lived temporary * variables, so may eventually be changed to something like LLVM's * SmallVector, but currently the program runs in a tiny fraction of a second, * so this is not an issue. */ typedef std::vector byte_buffer; /** * Helper function to push a big endian value into a byte buffer. We use * native-endian values for all of the in-memory data structures and only * transform them into big endian form for output. */ template inline void push_big_endian(byte_buffer &v, T val) { static_assert(sizeof(T) > 1, "Big endian doesn't make sense for single-byte values"); for (int bit=(sizeof(T) - 1)*8 ; bit>=0 ; bit-= 8) { v.push_back((val >> bit) & 0xff); } } +void push_string(byte_buffer &v, const std::string &s, bool escapes=false); + /** * Simple inline non-locale-aware check that this is a valid ASCII * digit. */ inline bool isdigit(char c) { return (c >= '0') && (c <= '9'); } /** * Simple inline non-locale-aware check that this is a valid ASCII * hex digit. */ inline bool ishexdigit(char c) { return ((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'Z')); + ((c >= 'A') && (c <= 'F')); } + +/** + * Simple inline non-locale-aware check that this is a valid ASCII + * letter. + */ +inline bool isalpha(char c) +{ + return ((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')); +} + +/** + * A wrapper around dirname(3) that handles inconsistencies relating to memory + * management between platforms and provides a std::string interface. + */ +std::string dirname(const std::string&); + +/** + * A wrapper around basename(3) that handles inconsistencies relating to memory + * management between platforms and provides a std::string interface. + */ +std::string basename(const std::string&); }// namespace dtc #endif // !_UTIL_HH_