PTX parser rewrite

Cargo.toml

@@ -1,5 +1,7 @@
 [workspace]
 
+resolver = "2"
+
 members = [
     "cuda_base",
     "cuda_types",
@@ -15,6 +17,9 @@ members = [
     "zluda_redirect",
     "zluda_ml",
     "ptx",
+    "ptx_parser",
+    "ptx_parser_macros",
+    "ptx_parser_macros_impl",
 ]
 
 default-members = ["zluda_lib", "zluda_ml", "zluda_inject", "zluda_redirect"]

ptx/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 [lib]
 
 [dependencies]
-lalrpop-util = "0.19"
+ptx_parser = { path = "../ptx_parser" }
 regex = "1"
 rspirv = "0.7"
 spirv_headers = "1.5" 
@@ -17,8 +17,12 @@ bit-vec = "0.6"
 half ="1.6"
 bitflags = "1.2"
 
+[dependencies.lalrpop-util]
+version = "0.19.12"
+features = ["lexer"]
+
 [build-dependencies.lalrpop]
-version = "0.19"
+version = "0.19.12"
 features = ["lexer"]
 
 [dev-dependencies]

ptx/src/ast.rs

@@ -16,6 +16,8 @@ pub enum PtxError {
         source: ParseFloatError,
     },
     #[error("")]
+    Unsupported32Bit,
+    #[error("")]
     SyntaxError,
     #[error("")]
     NonF32Ftz,
@@ -32,15 +34,9 @@ pub enum PtxError {
     #[error("")]
     NonExternPointer,
     #[error("{start}:{end}")]
-    UnrecognizedStatement {
-        start: usize,
-        end: usize,
-    },
+    UnrecognizedStatement { start: usize, end: usize },
     #[error("{start}:{end}")]
-    UnrecognizedDirective {
-        start: usize,
-        end: usize,
-    },
+    UnrecognizedDirective { start: usize, end: usize },
 }
 
 // For some weird reson this is illegal:
@@ -576,11 +572,15 @@ impl CvtDetails {
         if saturate {
             if src.kind() == ScalarKind::Signed {
                 if dst.kind() == ScalarKind::Signed && dst.size_of() >= src.size_of() {
-                    err.push(ParseError::from(PtxError::SyntaxError));
+                    err.push(ParseError::User {
+                        error: PtxError::SyntaxError,
+                    });
                 }
             } else {
                 if dst == src || dst.size_of() >= src.size_of() {
-                    err.push(ParseError::from(PtxError::SyntaxError));
+                    err.push(ParseError::User {
+                        error: PtxError::SyntaxError,
+                    });
                 }
             }
         }
@@ -596,7 +596,9 @@ impl CvtDetails {
         err: &'err mut Vec<ParseError<usize, Token<'input>, PtxError>>,
     ) -> Self {
         if flush_to_zero && dst != ScalarType::F32 {
-            err.push(ParseError::from(PtxError::NonF32Ftz));
+            err.push(ParseError::from(lalrpop_util::ParseError::User {
+                error: PtxError::NonF32Ftz,
+            }));
         }
         CvtDetails::FloatFromInt(CvtDesc {
             dst,
@@ -616,7 +618,9 @@ impl CvtDetails {
         err: &'err mut Vec<ParseError<usize, Token<'input>, PtxError>>,
     ) -> Self {
         if flush_to_zero && src != ScalarType::F32 {
-            err.push(ParseError::from(PtxError::NonF32Ftz));
+            err.push(ParseError::from(lalrpop_util::ParseError::User {
+                error: PtxError::NonF32Ftz,
+            }));
         }
         CvtDetails::IntFromFloat(CvtDesc {
             dst,

ptx/src/lib.rs

@@ -24,6 +24,7 @@ lalrpop_mod!(
 );
 
 pub mod ast;
+pub(crate) mod pass;
 #[cfg(test)]
 mod test;
 mod translate;