summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--lib/libproc_macro/Cargo.toml3
-rw-r--r--lib/libproc_macro/src/lib.rs493
-rw-r--r--minicargo.mk25
4 files changed, 519 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 2f8e3b4b..e0c1c769 100644
--- a/Makefile
+++ b/Makefile
@@ -147,12 +147,12 @@ MAKE_MINICARGO = $(MAKE) -f minicargo.mk RUSTC_VERSION=$(shell cat $(RUSTC_SRC_D
output/libstd.hir: $(BIN) $(RUSTC_SRC_DL)
$(MAKE_MINICARGO) $@
-output/libtest.hir output/libpanic_unwind.hir: output/libstd.hir
+output/libtest.hir output/libpanic_unwind.hir output/libproc_macro.hir: output/libstd.hir
$(MAKE_MINICARGO) $@
output/rustc output/cargo: output/libtest.hir
$(MAKE_MINICARGO) $@
-TEST_DEPS := output/libstd.hir output/libtest.hir output/libpanic_unwind.hir
+TEST_DEPS := output/libstd.hir output/libtest.hir output/libpanic_unwind.hir output/test_deps/librust_test_helpers.a
output/lib%-test: $(RUSTCSRC)src/lib%/lib.rs $(RUSTC_SRC_DL) $(TEST_DEPS)
@echo "--- [MRUSTC] --test -o $@"
diff --git a/lib/libproc_macro/Cargo.toml b/lib/libproc_macro/Cargo.toml
new file mode 100644
index 00000000..382bf13f
--- /dev/null
+++ b/lib/libproc_macro/Cargo.toml
@@ -0,0 +1,3 @@
+[package]
+name = "proc_macro"
+version = "0.0.0"
diff --git a/lib/libproc_macro/src/lib.rs b/lib/libproc_macro/src/lib.rs
new file mode 100644
index 00000000..4afc2cbd
--- /dev/null
+++ b/lib/libproc_macro/src/lib.rs
@@ -0,0 +1,493 @@
+// MRustC custom version of libproc_macro
+//
+// Unlike the rustc version, this one is designed to live complely detached from its compiler.
+// See the
+use std::fmt;
+use std::str::FromStr;
+
+pub struct TokenStream {
+ inner: Vec<Token>,
+}
+
+enum Token {
+ Symbol(String),
+ Ident(String),
+ Lifetime(String),
+ String(String),
+ ByteString(Vec<u8>),
+ CharLit(char),
+ UnsignedInt(u128, u8), // Value, size (0=?,8,16,32,64,128)
+ SignedInt(i128, u8), // Value, size (0=?,8,16,32,64,128)
+ Float(f64, u8), // Value, size (0, 32, 64)
+}
+
+impl From<char> for Token {
+ fn from(v: char) -> Token {
+ Token::String(v.to_string())
+ }
+}
+
+macro_rules! some_else {
+ ($e:expr => $alt:expr) => {match $e { Some(v) => v, None => $alt }};
+}
+
+struct CharStream<T: Iterator<Item=char>> {
+ inner: ::std::iter::Peekable<T>,
+ cur: Option<char>,
+}
+impl<T: Iterator<Item=char>> CharStream<T> {
+ fn new(i: T) -> Self {
+ CharStream {
+ inner: i.peekable(),
+ cur: Some(' '),
+ }
+ }
+ fn consume(&mut self) -> Option<char> {
+ self.cur = self.inner.next();
+ self.cur
+ }
+ fn is_complete(&self) -> bool {
+ self.cur.is_none()
+ }
+ fn cur(&self) -> char {
+ self.cur.unwrap()
+ }
+ fn next(&self) -> Option<char> {
+ self.inner.peek().cloned()
+ }
+}
+
+pub struct LexError {
+ _inner: (),
+}
+impl FromStr for TokenStream {
+ type Err = LexError;
+ fn from_str(src: &str) -> Result<TokenStream, LexError> {
+ let rv = Vec::new();
+ let mut it = CharStream::new(src.chars());
+
+ fn err() -> Result<TokenStream,LexError> {
+ Err(LexError { _inner: () })
+ }
+
+ 'outer: while ! it.is_complete()
+ {
+ let c = it.cur();
+
+ if c.is_whitespace() {
+ continue ;
+ }
+
+ let syms = [
+ b"!" as &[u8],
+ b"!=",
+ b"#",
+ b"$",
+ b"%", b"%=",
+ b"&", b"&&", b"&=",
+ b"(",
+ b")",
+ b"*", b"*=",
+ b"+", b"+=",
+ b",",
+ b"-", b"-=", b"->",
+ b".", b"..", b"...",
+ b"/", b"/=",
+ b":", b"::",
+ b";",
+ b"<", b"<-", b"<<", b"<<=", b"<=",
+ b"=", b"==", b"=>",
+ b">", b">=", b">>", b">>=",
+ b"?",
+ b"@",
+ b"[",
+ b"\\",
+ b"]",
+ b"^", b"^=",
+ b"`",
+ b"{",
+ b"|", b"|=", b"||",
+ b"}",
+ b"~",
+ ];
+ if c == '\''
+ {
+ // Lifetime or char lit
+ panic!("TODO: Lifetime / char literal");
+ }
+ else if c == '/' && it.next() == Some('/')
+ {
+ // Line comment
+ while it.consume() != Some('\n') {
+ }
+ }
+ else if c == '/' && it.next() == Some('*')
+ {
+ // Block comment
+ panic!("TODO: Block comment");
+ }
+ else
+ {
+ // byte or raw string literals
+ if c == 'b' || c == 'r' || c == '"' {
+ let mut c = c;
+ let is_byte = if c == 'b' {
+ c = some_else!(it.consume() => { rv.push(Token::Ident("b".into())); break });
+ true
+ } else {
+ false
+ };
+
+ if c == 'r'
+ {
+ let ident_str = if is_byte { "br" } else { "r" };
+ c = some_else!(it.consume() => { rv.push(Token::Ident(ident_str.into())); break });
+ let mut hashes = 0;
+ while c == '#' {
+ hashes += 1;
+ c = some_else!(it.consume() => return err());
+ }
+
+ if c != '"' {
+ return err();
+ }
+
+ let req_hashes = hashes;
+ let mut rawstr = String::new();
+ loop
+ {
+ c = some_else!(it.consume() => return err());
+ if c == '"' {
+ let mut hashes = 0;
+ while hashes < req_hashes {
+ c = some_else!(it.consume() => return err());
+ if c != '#' { break ; }
+ hashes += 1;
+ }
+
+ if hashes != req_hashes {
+ rawstr.push('"');
+ for _ in 0 .. hashes {
+ rawstr.push('#');
+ }
+ rawstr.push(c);
+ }
+ else {
+ break ;
+ }
+ }
+ else {
+ rawstr.push(c);
+ }
+ }
+
+ rv.push(if is_byte { Token::ByteString(rawstr.into_bytes()) } else { Token::String(rawstr) });
+ continue 'outer;
+ }
+ else if c == '\''
+ {
+ // Byte character literal?
+ // NOTE: That b'foo is not `b` followed by `'foo`
+ assert!(is_byte);
+ panic!("TODO: Byte character literal");
+ }
+ else if c == '\"'
+ {
+ // String literal
+ panic!("TODO: Escaped string literal");
+ }
+ else
+ {
+ // Could be an ident starting with 'b', or it's just 'b'
+ // - Fall through
+ }
+ }
+
+ // Identifier.
+ if c.is_xid_start()
+ {
+ let mut ident = String::new();
+ while c.is_xid_continue()
+ {
+ ident.push(c);
+ c = some_else!(it.consume() => break);
+ }
+ rv.push(Token::Ident(ident));
+ }
+ // Punctuation?
+ else if c as u32 <= 0xFF
+ {
+ let mut start = match syms.binary_search_by(|v| Ord::cmp(&v[0], &(c as u8)))
+ {
+ Ok(start) => start,
+ Err(_) => return err(),
+ };
+ let mut end = start+1;
+ while end < syms.len() && syms[end][0] == c as u8 {
+ end += 1;
+ }
+
+ let mut ofs = 1;
+ loop
+ {
+ let syms = &syms[start..end];
+ assert!(ofs == syms[0].len());
+ c = some_else!(it.consume() => break);
+ let step = match syms[1..].binary_search_by(|v| Ord::cmp(&v[ofs], &(c as u8)))
+ {
+ Ok(s) => s+1,
+ Err(_) => break,
+ };
+ start += step;
+ end = start+1;
+ while end < syms.len() && syms[end][ofs] == c as u8 {
+ end += 1;
+ }
+ ofs += 1;
+ }
+ assert!(syms[start].len() == ofs);
+ rv.push(Token::Symbol(::std::str::from_utf8(syms[start]).unwrap().into()));
+ }
+ else
+ {
+ return err();
+ }
+ }
+ }
+
+ Ok(TokenStream {
+ inner: rv,
+ })
+ }
+}
+
+
+#[stable(feature = "proc_macro_lib", since = "1.15.0")]
+impl fmt::Display for TokenStream {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ for v in &self.inner
+ {
+ f.write_str(" ")?;
+ match v
+ {
+ &Token::Symbol(ref s) => s.fmt(f)?,
+ //&Token::Keyword(ref s) => s.fmt(f)?,
+ &Token::Ident(ref s) => s.fmt(f)?,
+ &Token::Lifetime(ref s) => write!(f, "'{}", s)?,
+ &Token::String(ref s) => write!(f, "{:?}", s)?,
+ &Token::ByteString(ref v) => {
+ f.write_str("b\"")?;
+ for &b in v {
+ if b != b'"' && b >= b' ' && b <= b'z' {
+ (b as char).fmt(f)?;
+ }
+ else {
+ write!(f, "\\x{:02x}", b)?;
+ }
+ }
+ f.write_str("\"")?;
+ },
+ &Token::CharLit(v) => match v
+ {
+ '\'' => f.write_str("'\\''")?,
+ '\0' => f.write_str("'\\0'")?,
+ '\n' => f.write_str("'\\n'")?,
+ ' ' ... 'z' => write!(f, "'{}'", v)?,
+ _ => write!(f, "'\\u{:x}'", v as u32)?,
+ },
+ &Token::UnsignedInt(v,sz) => {
+ v.fmt(f)?;
+ if sz == 0 {
+ }
+ else if sz == 1 {
+ f.write_str("usize")?;
+ }
+ else {
+ f.write_str("u")?;
+ sz.fmt(f)?;
+ }
+ },
+ &Token::SignedInt(v,sz) => {
+ v.fmt(f)?;
+ if sz == 0 {
+ }
+ else if sz == 1 {
+ f.write_str("usize")?;
+ }
+ else {
+ f.write_str("u")?;
+ sz.fmt(f)?;
+ }
+ },
+ &Token::Float(v, sz) => {
+ v.fmt(f)?;
+ if sz == 0 {
+ }
+ else {
+ f.write_str("f")?;
+ sz.fmt(f)?;
+ }
+ },
+ }
+ }
+ Ok( () )
+ }
+}
+
+/// Receive a token stream from the compiler
+pub fn recv_token_stream() -> TokenStream
+{
+ struct Reader<R> {
+ inner: R,
+ }
+ impl<R: ::std::io::Read> Reader<R> {
+ fn getb(&mut self) -> Option<u8> {
+ let mut b = [0];
+ match self.inner.read(&mut b)
+ {
+ Ok(1) => Some(b[0]),
+ Ok(0) => None,
+ Ok(_) => panic!("Bad byte count"),
+ Err(e) => panic!("Error reading from stdin - {}", e),
+ }
+ }
+ fn get_u128v(&mut self) -> u128 {
+ let mut ofs = 0;
+ let mut raw_rv = 0u128;
+ loop
+ {
+ let b = self.getb().unwrap();
+ raw_rv |= ((b & 0x7F) as u128) << ofs;
+ if b < 128 {
+ break;
+ }
+ assert!(ofs < 18); // at most 18 bytes needed for a i128
+ ofs += 7;
+ }
+ raw_rv
+ }
+ fn get_i128v(&mut self) -> i128 {
+ let raw_rv = self.get_u128v();
+ // Zig-zag encoding (0 = 0, 1 = -1, 2 = 1, ...)
+ if raw_rv & 1 != 0 {
+ -( (raw_rv >> 1) as i128 + 1 )
+ }
+ else {
+ (raw_rv >> 1) as i128
+ }
+ }
+ fn get_byte_vec(&mut self) -> Vec<u8> {
+ let size = self.get_u128v();
+ assert!(size < (1<<30));
+ let size = size as usize;
+ let mut buf = vec![0u8; size];
+ match self.inner.read_exact(&mut buf)
+ {
+ Ok(_) => {},
+ Err(e) => panic!("Error reading from stdin - {}", e),
+ }
+
+ buf
+ }
+ fn get_string(&mut self) -> String {
+ let raw = self.get_byte_vec();
+ String::from_utf8(raw).expect("Invalid UTF-8 passed from compiler")
+ }
+ fn get_f64(&mut self) -> f64 {
+ let mut buf = [0u8; 8];
+ match self.inner.read_exact(&mut buf)
+ {
+ Ok(_) => {},
+ Err(e) => panic!("Error reading from stdin - {}", e),
+ }
+ unsafe {
+ ::std::mem::transmute(buf)
+ }
+ }
+ }
+
+ let mut s = Reader { inner: ::std::io::stdin().lock() };
+ let mut toks = Vec::new();
+ loop
+ {
+ let hdr_b = some_else!( s.getb() => break );
+ toks.push(match hdr_b
+ {
+ 0 => Token::Symbol( s.get_string() ),
+ 1 => Token::Ident( s.get_string() ),
+ 2 => Token::Lifetime( s.get_string() ),
+ 3 => Token::String( s.get_string() ),
+ 4 => Token::ByteString( s.get_byte_vec() ),
+ 5 => Token::CharLit(::std::char::from_u32(s.get_i128v() as u32).expect("char lit")),
+ 6 => {
+ let ty = s.getb().expect("getb int ty");
+ Token::UnsignedInt(s.get_u128v(), ty)
+ },
+ 7 => {
+ let ty = s.getb().expect("getb int ty");
+ Token::SignedInt(s.get_i128v(), ty)
+ },
+ 8 => {
+ let ty = s.getb().expect("getb float ty");
+ Token::Float(s.get_f64(), ty)
+ }
+ });
+ }
+ TokenStream {
+ inner: toks,
+ }
+}
+/// Send a token stream back to the compiler
+pub fn send_token_stream(ts: TokenStream)
+{
+ struct Writer<T> {
+ inner: T,
+ }
+ impl<T: ::std::io::Write> Writer<T> {
+ fn putb(&mut self, v: u8) {
+ let buf = [v];
+ self.inner.write(&buf).expect("");
+ }
+ fn put_u128v(&mut self, mut v: u128) {
+ while v > 128 {
+ self.putb( (v & 0x7F) as u8 | 0x80 );
+ v >>= 7;
+ }
+ self.putb( (v & 0x7F) as u8 );
+ }
+ fn put_i128v(&mut self, v: i128) {
+ if v < 0 {
+ self.put_u128v( (((v + 1) as u128) << 1) | 1 );
+ }
+ else {
+ self.put_u128v( (v as u128) << 1 );
+ }
+ }
+ fn put_bytes(&mut self, v: &[u8]) {
+ self.put_u128v(v.len() as u128);
+ self.inner.write(v).expect("");
+ }
+ fn put_f64(&mut self, v: f64) {
+ let buf: [u8; 8] = unsafe { ::std::mem::transmute(v) };
+ self.inner.write(&buf).expect("");
+ }
+ }
+
+ let mut s = Writer { inner: ::std::io::stdout().lock() };
+
+ for t in &ts.inner
+ {
+ match t
+ {
+ &Token::Symbol(ref v) => { s.putb(0); s.put_bytes(v.as_bytes()); },
+ &Token::Ident(ref v) => { s.putb(1); s.put_bytes(v.as_bytes()); },
+ &Token::Lifetime(ref v) => { s.putb(2); s.put_bytes(v.as_bytes()); },
+ &Token::String(ref v) => { s.putb(3); s.put_bytes(v.as_bytes()); },
+ &Token::ByteString(ref v) => { s.putb(4); s.put_bytes(&v[..]); },
+ &Token::CharLit(v) => { s.putb(5); s.put_u128v(v as u32 as u128); },
+ &Token::UnsignedInt(v, sz) => { s.putb(6); s.putb(sz); s.put_u128v(v); },
+ &Token::SignedInt(v, sz) => { s.putb(7); s.putb(sz); s.put_i128v(v); },
+ &Token::Float(v, sz) => { s.putb(8); s.putb(sz); s.put_f64(v); },
+ }
+ }
+}
diff --git a/minicargo.mk b/minicargo.mk
index 4887ba51..8332205e 100644
--- a/minicargo.mk
+++ b/minicargo.mk
@@ -16,11 +16,16 @@ LLVM_CONFIG := $(RUSTCSRC)build/bin/llvm-config
RUSTC_TARGET := x86_64-unknown-linux-gnu
OVERRIDE_DIR := script-overrides/$(RUSTC_CHANNEL)-$(RUSTC_VERSION)$(OVERRIDE_SUFFIX)/
-.PHONY: bin/mrustc tools/bin/minicargo $(OUTDIR)libsrc.hir $(OUTDIR)libtest.hir $(OUTDIR)libpanic_unwind.hir $(OUTDIR)rustc $(OUTDIR)cargo
+.PHONY: bin/mrustc tools/bin/minicargo
+.PHONY: $(OUTDIR)libstd.hir $(OUTDIR)libtest.hir $(OUTDIR)libpanic_unwind.hir $(OUTDIR)libproc_macro.hir
+.PHONY: $(OUTDIR)rustc $(OUTDIR)cargo
+
+.PHONY: all LIBS
+
all: $(OUTDIR)rustc
-mini: $(OUTDIR)libpanic_unwind.hir $(OUTDIR)libtest.hit
+LIBS: $(OUTDIR)libstd.hir $(OUTDIR)libtest.hir $(OUTDIR)libpanic_unwind.hir $(OUTDIR)libproc_macro.hir
$(MRUSTC):
$(MAKE) -f Makefile all
@@ -42,6 +47,10 @@ $(OUTDIR)libtest.hir: $(MRUSTC) $(MINICARGO) $(OUTDIR)libstd.hir $(OUTDIR)libpan
$(OUTDIR)libgetopts.hir: $(MRUSTC) $(MINICARGO) $(OUTDIR)libstd.hir
$(MINICARGO) $(RUSTCSRC)src/libgetopts --script-overrides $(OVERRIDE_DIR) --output-dir $(OUTDIR)
test -e $@
+# MRustC custom version of libproc_macro
+$(OUTDIR)libproc_macro.hir: $(MRUSTC) $(MINICARGO) $(OUTDIR)libstd.hir
+ $(MINICARGO) lib/libproc_macro --output-dir $(OUTDIR)
+ test -e $@
RUSTC_ENV_VARS := CFG_COMPILER_HOST_TRIPLE=$(RUSTC_TARGET)
RUSTC_ENV_VARS += LLVM_CONFIG=$(abspath $(LLVM_CONFIG))
@@ -51,9 +60,9 @@ RUSTC_ENV_VARS += CFG_VERSION=$(RUSTC_VERSION)-$(RUSTC_CHANNEL)-mrustc
RUSTC_ENV_VARS += CFG_PREFIX=mrustc
RUSTC_ENV_VARS += CFG_LIBDIR_RELATIVE=lib
-$(OUTDIR)rustc: $(MRUSTC) $(MINICARGO) $(OUTDIR)libstd.hir $(OUTDIR)libtest.hir $(OUTDIR)libgetopts.hir $(LLVM_CONFIG)
+$(OUTDIR)rustc: $(MRUSTC) $(MINICARGO) LIBS $(LLVM_CONFIG)
$(RUSTC_ENV_VARS) $(MINICARGO) $(RUSTCSRC)src/rustc --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
-$(OUTDIR)cargo: $(MRUSTC) $(OUTDIR)libstd.hir
+$(OUTDIR)cargo: $(MRUSTC) LIBS
$(MINICARGO) $(RUSTCSRC)src/tools/cargo --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
# Reference $(RUSTCSRC)src/bootstrap/native.rs for these values
@@ -77,3 +86,11 @@ $(RUSTCSRC)build/Makefile: $(RUSTCSRC)src/llvm/CMakeLists.txt
#
#$(OUTDIR)libserde-1_0_6.hir: $(MRUSTC) $(OUTDIR)libstd.hir
# $(MINICARGO) $(RUSTCSRC)src/vendor/serde --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
+$(OUTDIR)libgit2-0_6_6.hir: $(MRUSTC) LIBS
+ $(MINICARGO) $(RUSTCSRC)src/vendor/git2 --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR) --features ssh,https,curl,openssl-sys,openssl-probe
+$(OUTDIR)libserde_json-1_0_2.hir: $(MRUSTC) LIBS
+ $(MINICARGO) $(RUSTCSRC)src/vendor/serde_json --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
+$(OUTDIR)libcurl-0_4_6.hir: $(MRUSTC) LIBS
+ $(MINICARGO) $(RUSTCSRC)src/vendor/curl --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
+$(OUTDIR)libterm-0_4_5.hir: $(MRUSTC) LIBS
+ $(MINICARGO) $(RUSTCSRC)src/vendor/term --vendor-dir $(RUSTCSRC)src/vendor --output-dir $(OUTDIR)
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 21:53:47 +0000