Lots of improvements to the BSD-licensed dtc

- Various fixes to includes (including recursive includes)
- Lots of testing that the output exactly matches GPL'd dtc
- Lots of bug fixes to merging
- Fix incorrect mmap usage
- Ad-hoc memory management replaced with C++11 unique_ptr and similar

Patrick Wildt has successfully run many (all?) of the GPL dtc test suite.

1 files changed, 14 insertions, 19 deletions

diff --git a/usr.bin/dtc/checking.cc b/usr.bin/dtc/checking.cc
index 9c7f43c01dc5..70731ce7155f 100644
--- a/usr.bin/dtc/checking.cc
+++ b/usr.bin/dtc/checking.cc
@@ -51,7 +51,7 @@ namespace
 	struct address_cells_checker : public checker
 	{
 		address_cells_checker(const char *name) : checker(name) {}
-		virtual bool check_node(device_tree *tree, node *n)
+		virtual bool check_node(device_tree *tree, const node_ptr &n)
 		{
 			// If this has no children, it trivially meets the
 			// conditions.
@@ -61,8 +61,7 @@ namespace
 			}
 			bool found_address = false;
 			bool found_size = false;
-			for (node::property_iterator i=n->property_begin(),
-			     e=n->property_end() ; i!=e ; ++i)
+			for (auto i=n->property_begin(), e=n->property_end() ; i!=e ; ++i)
 			{
 				if (!found_address)
 				{
@@ -91,7 +90,7 @@ namespace
 } // anonymous namespace
 
 bool
-checker::visit_node(device_tree *tree, node *n)
+checker::visit_node(device_tree *tree, const node_ptr &n)
 {
 	path.push_back(std::make_pair(n->name, n->unit_address));
 	// Check this node
@@ -100,8 +99,7 @@ checker::visit_node(device_tree *tree, node *n)
 		return false;
 	}
 	// Now check its properties
-	for (node::property_iterator i=n->property_begin(), e=n->property_end()
-	     ; i!=e ; ++i)
+	for (auto i=n->property_begin(), e=n->property_end() ; i!=e ; ++i)
 	{
 		if (!check_property(tree, n, *i))
 		{
@@ -125,22 +123,21 @@ void
 checker::report_error(const char *errmsg)
 {
 	fprintf(stderr, "Error: %s, while checking node: ", errmsg);
-	for (device_tree::node_path::iterator p=path.begin()+1, pe=path.end() ;
-	     p!=pe ; ++p)
+	for (auto &p : path)
 	{
 		putc('/', stderr);
-		p->first.dump();
-		if (!(p->second.empty()))
+		p.first.dump();
+		if (!(p.second.empty()))
 		{
 			putc('@', stderr);
-			p->second.dump();
+			p.second.dump();
 		}
 	}
 	fprintf(stderr, " [-W%s]\n", checker_name);
 }
 
 bool
-property_checker::check_property(device_tree *tree, node *n, property *p)
+property_checker::check_property(device_tree *tree, const node_ptr &n, property_ptr p)
 {
 	if (p->get_key() == key)
 	{
@@ -154,7 +151,7 @@ property_checker::check_property(device_tree *tree, node *n, property *p)
 }
 
 bool
-property_size_checker::check(device_tree *tree, node *n, property *p)
+property_size_checker::check(device_tree *tree, const node_ptr &n, property_ptr p)
 {
 	uint32_t psize = 0;
 	for (property::value_iterator i=p->begin(),e=p->end() ; i!=e ; ++i)
@@ -216,10 +213,9 @@ bool
 check_manager::run_checks(device_tree *tree, bool keep_going)
 {
 	bool success = true;
-	for (std::map<string, checker*>::iterator i=checkers.begin(),
-	     e=checkers.end() ; i!=e ; ++i)
+	for (auto &i : checkers)
 	{
-		success &= i->second->check_tree(tree);
+		success &= i.second->check_tree(tree);
 		if (!(success || keep_going))
 		{
 			break;
@@ -231,7 +227,7 @@ check_manager::run_checks(device_tree *tree, bool keep_going)
 bool
 check_manager::disable_checker(string name)
 {
-	std::map<string, checker*>::iterator checker = checkers.find(name);
+	auto checker = checkers.find(name);
 	if (checker != checkers.end())
 	{
 		disabled_checkers.insert(std::make_pair(name,
@@ -245,8 +241,7 @@ check_manager::disable_checker(string name)
 bool
 check_manager::enable_checker(string name)
 {
-	std::map<string, checker*>::iterator checker =
-		disabled_checkers.find(name);
+	auto checker = disabled_checkers.find(name);
 	if (checker != disabled_checkers.end())
 	{
 		checkers.insert(std::make_pair(name, checker->second));