Extracted lpc pt code to src/hal/lpc17xx once again.

farcaller · farcaller · commit a78a40ad22d2 · 2014-06-15T12:51:13.000+01:00
diff --git a/platformtree/builder.rs b/platformtree/builder.rs
@@ -18,6 +18,7 @@ use syntax::ast;
 use syntax::codemap::{ExpnInfo, NameAndSpan, MacroBang};
 use syntax::ext::base::ExtCtxt;
 
+use lpc17xx_pt;
 use node;
 
 pub struct Builder {
@@ -71,126 +72,3 @@ fn build_mcu(builder: &mut Builder, cx: &mut ExtCtxt, node: &Gc<node::Node>) {
 
   cx.bt_pop();
 }
-
-mod lpc17xx_pt {
-  use std::gc::Gc;
-  use syntax::ext::base::ExtCtxt;
-  use syntax::ext::build::AstBuilder;
-  use syntax::ext::quote::rt::{ToTokens, ExtParseUtils};
-  use syntax::ast::TokenTree;
-
-  use super::Builder;
-  use node;
-
-
-  pub fn build_mcu(builder: &mut Builder, cx: &mut ExtCtxt,
-      node: &Gc<node::Node>) {
-    if !node.expect_no_attributes(cx) {
-      return;
-    }
-    // init stack
-    builder.add_main_statement(cx.stmt_expr(quote_expr!(&*cx,
-        {
-          use zinc::hal::stack;
-          extern { static _eglobals: u32; }
-          stack::set_stack_limit((&_eglobals as *u32) as u32);
-        }
-    )));
-
-    // init data
-    builder.add_main_statement(cx.stmt_expr(quote_expr!(&*cx,
-        zinc::hal::mem_init::init_data();
-    )));
-
-    node.get_by_path("clock").and_then(|sub| -> Option<bool> {
-      build_clock(builder, cx, sub);
-      None
-    });
-  }
-
-  pub fn build_clock(builder: &mut Builder, cx: &mut ExtCtxt,
-      node: &Gc<node::Node>) {
-    if !node.expect_attributes(cx, vec!(("source", node::StringAttribute))) {
-      return;
-    }
-
-    let source = node.get_string_attr("source").unwrap();
-    let clock_source = ClockSource::new(match source.as_slice() {
-      "internal-oscillator" => "init::Internal".to_str(),
-      "rtc-oscillator"      => "init::RTC".to_str(),
-      "main-oscillator"     => {
-        let some_source_frequency =
-            node.get_required_int_attr(cx, "source_frequency");
-        if some_source_frequency == None {
-          "BAD".to_str()
-        } else {
-          format!("init::Main({})", some_source_frequency.unwrap())
-        }
-      },
-      other => {
-        cx.span_err(
-            node.get_attr("source").value_span,
-            format!("unknown oscillator value `{}`", other).as_slice());
-        "BAD".to_str()
-      },
-    });
-
-    let some_pll_conf = node.get_by_path("pll").and_then(|sub|
-        -> Option<(uint, uint, uint)> {
-      if !sub.expect_no_subnodes(cx) || !sub.expect_attributes(cx, vec!(
-          ("m", node::IntAttribute),
-          ("n", node::IntAttribute),
-          ("divisor", node::IntAttribute))) {
-        None
-      } else {
-        let m = sub.get_int_attr("m").unwrap();
-        let n = sub.get_int_attr("n").unwrap();
-        let divisor = sub.get_int_attr("divisor").unwrap();
-        Some((m, n, divisor))
-      }
-    });
-    if some_pll_conf.is_none() {
-      cx.parse_sess().span_diagnostic.span_err(node.name_span,
-          "required subnode `pll` is missing");
-      return;
-    }
-
-    let (m, n, divisor) = some_pll_conf.unwrap();
-
-    let ex = quote_expr!(&*cx,
-        {
-          use zinc::hal::lpc17xx::init;
-          init::init_clock(
-              init::Clock {
-                source: $clock_source,
-                pll: init::PLL0 {
-                  enabled: true,
-                  m: $m,
-                  n: $n,
-                  divisor: $divisor,
-                }
-              }
-          );
-        }
-    );
-    builder.add_main_statement(cx.stmt_expr(ex));
-  }
-
-  struct ClockSource {
-    pub s: String,
-  }
-
-  impl ClockSource {
-    pub fn new(s: String) -> ClockSource {
-      ClockSource {
-        s: s,
-      }
-    }
-  }
-
-  impl ToTokens for ClockSource {
-    fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {
-      (cx as &ExtParseUtils).parse_tts(self.s.clone())
-    }
-  }
-}
diff --git a/platformtree/builder_test.rs b/platformtree/builder_test.rs
@@ -13,88 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use builder::build_platformtree;
-use test_helpers::{assert_equal_source, with_parsed, fails_to_build};
-
-#[test]
-fn parses_lpc17xx() {
-  with_parsed("mcu@lpc17xx;", |cx, failed, pt| {
-    let builder = build_platformtree(cx, pt);
-    assert!(unsafe{*failed} == false);
-    assert!(builder.main_stmts.len() == 2);
-
-    assert_equal_source(builder.main_stmts.get(0),
-        "{
-          use zinc::hal::stack;
-          extern \"C\" {
-            static _eglobals: u32;
-          }
-          stack::set_stack_limit((&_eglobals as *u32) as u32);
-        }");
-    assert_equal_source(builder.main_stmts.get(1),
-        "zinc::hal::mem_init::init_data()");
-  });
-}
-
-#[test]
-fn fails_to_parse_lpc17xx_with_garbage_attrs() {
-  fails_to_build("mcu@lpc17xx { key = 1; }");
-}
-
-#[test]
-fn parses_lpc17xx_clock() {
-  with_parsed("mcu@lpc17xx {
-      clock {
-        source = \"main-oscillator\";
-        source_frequency = 12_000_000;
-        pll {
-          m = 50;
-          n = 3;
-          divisor = 4;
-        }
-      }
-    }", |cx, failed, pt| {
-    let builder = build_platformtree(cx, pt);
-    assert!(unsafe{*failed} == false);
-    assert!(builder.main_stmts.len() == 3);
-
-    assert_equal_source(builder.main_stmts.get(2),
-        "{
-          use zinc::hal::lpc17xx::init;
-          init::init_clock(
-              init::Clock {
-                source: init::Main(12000000),
-                pll: init::PLL0 {
-                  enabled: true,
-                  m: 50u,
-                  n: 3u,
-                  divisor: 4u,
-                },
-              }
-          );
-        }");
-  });
-}
-
-#[test]
-fn fails_to_parse_lpc17xx_with_bad_clock_conf() {
-  fails_to_build("mcu@lpc17xx { clock {
-    no_source = 1;
-    source_frequency = 12_000_000;
-  }}");
-  fails_to_build("mcu@lpc17xx { clock {
-    source = \"missing\";
-    source_frequency = 12_000_000;
-  }}");
-}
-
-#[test]
-fn fails_to_parse_lpc17xx_with_no_pll() {
-  fails_to_build("mcu@lpc17xx { clock {
-    source = \"main-oscillator\";
-    source_frequency = 12_000_000;
-  }}");
-}
+use test_helpers::fails_to_build;
 
 #[test]
 fn fails_to_parse_pt_with_unknown_root_node() {
diff --git a/platformtree/platformtree.rs b/platformtree/platformtree.rs
@@ -25,6 +25,10 @@ pub mod node;
 pub mod parser;
 pub mod builder;
 
+#[path="../src/hal/lpc17xx/platformtree.rs"] mod lpc17xx_pt;
+#[cfg(test)]
+#[path="../src/hal/lpc17xx/platformtree_test.rs"] mod lpc17xx_pt_test;
+
 #[cfg(test)] mod test_helpers;
 #[cfg(test)] mod parser_test;
 #[cfg(test)] mod builder_test;
diff --git a/src/hal/lpc17xx/platformtree.rs b/src/hal/lpc17xx/platformtree.rs
@@ -0,0 +1,134 @@
+// Zinc, the bare metal stack for rust.
+// Copyright 2014 Vladimir "farcaller" Pouzanov <farcaller@gmail.com>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::gc::Gc;
+use syntax::ext::base::ExtCtxt;
+use syntax::ext::build::AstBuilder;
+use syntax::ext::quote::rt::{ToTokens, ExtParseUtils};
+use syntax::ast::TokenTree;
+
+use builder::Builder;
+use node;
+
+pub fn build_mcu(builder: &mut Builder, cx: &mut ExtCtxt,
+    node: &Gc<node::Node>) {
+  if !node.expect_no_attributes(cx) {
+    return;
+  }
+  // init stack
+  builder.add_main_statement(cx.stmt_expr(quote_expr!(&*cx,
+      {
+        use zinc::hal::stack;
+        extern { static _eglobals: u32; }
+        stack::set_stack_limit((&_eglobals as *u32) as u32);
+      }
+  )));
+
+  // init data
+  builder.add_main_statement(cx.stmt_expr(quote_expr!(&*cx,
+      zinc::hal::mem_init::init_data();
+  )));
+
+  node.get_by_path("clock").and_then(|sub| -> Option<bool> {
+    build_clock(builder, cx, sub);
+    None
+  });
+}
+
+pub fn build_clock(builder: &mut Builder, cx: &mut ExtCtxt,
+    node: &Gc<node::Node>) {
+  if !node.expect_attributes(cx, vec!(("source", node::StringAttribute))) {
+    return;
+  }
+
+  let source = node.get_string_attr("source").unwrap();
+  let clock_source = ClockSource::new(match source.as_slice() {
+    "internal-oscillator" => "init::Internal".to_str(),
+    "rtc-oscillator"      => "init::RTC".to_str(),
+    "main-oscillator"     => {
+      let some_source_frequency =
+          node.get_required_int_attr(cx, "source_frequency");
+      if some_source_frequency == None {
+        "BAD".to_str()
+      } else {
+        format!("init::Main({})", some_source_frequency.unwrap())
+      }
+    },
+    other => {
+      cx.span_err(
+          node.get_attr("source").value_span,
+          format!("unknown oscillator value `{}`", other).as_slice());
+      "BAD".to_str()
+    },
+  });
+
+  let some_pll_conf = node.get_by_path("pll").and_then(|sub|
+      -> Option<(uint, uint, uint)> {
+    if !sub.expect_no_subnodes(cx) || !sub.expect_attributes(cx, vec!(
+        ("m", node::IntAttribute),
+        ("n", node::IntAttribute),
+        ("divisor", node::IntAttribute))) {
+      None
+    } else {
+      let m = sub.get_int_attr("m").unwrap();
+      let n = sub.get_int_attr("n").unwrap();
+      let divisor = sub.get_int_attr("divisor").unwrap();
+      Some((m, n, divisor))
+    }
+  });
+  if some_pll_conf.is_none() {
+    cx.parse_sess().span_diagnostic.span_err(node.name_span,
+        "required subnode `pll` is missing");
+    return;
+  }
+
+  let (m, n, divisor) = some_pll_conf.unwrap();
+
+  let ex = quote_expr!(&*cx,
+      {
+        use zinc::hal::lpc17xx::init;
+        init::init_clock(
+            init::Clock {
+              source: $clock_source,
+              pll: init::PLL0 {
+                enabled: true,
+                m: $m,
+                n: $n,
+                divisor: $divisor,
+              }
+            }
+        );
+      }
+  );
+  builder.add_main_statement(cx.stmt_expr(ex));
+}
+
+struct ClockSource {
+  pub s: String,
+}
+
+impl ClockSource {
+  pub fn new(s: String) -> ClockSource {
+    ClockSource {
+      s: s,
+    }
+  }
+}
+
+impl ToTokens for ClockSource {
+  fn to_tokens(&self, cx: &ExtCtxt) -> Vec<TokenTree> {
+    (cx as &ExtParseUtils).parse_tts(self.s.clone())
+  }
+}
diff --git a/src/hal/lpc17xx/platformtree_test.rs b/src/hal/lpc17xx/platformtree_test.rs
