diff options
| author | jjasmine <tanghocle456@gmail.com> | 2024-05-31 02:01:18 -0700 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-06-13 15:31:07 +0000 |
| commit | e63fba72a6544be08fec2edf0fe9011208e9bf8a (patch) | |
| tree | c3a06fa7df958b2c48a193438726a5ed14b2b4c7 /gcc/rust/expand/rust-macro-builtins.cc | |
| parent | bfcebbf7e1d36a5b999ed41d0fc2e9acbbed4dbb (diff) | |
| download | gcc-e63fba72a6544be08fec2edf0fe9011208e9bf8a.zip gcc-e63fba72a6544be08fec2edf0fe9011208e9bf8a.tar.gz gcc-e63fba72a6544be08fec2edf0fe9011208e9bf8a.tar.bz2 | |
Refactoring for inline asm pr
gcc/rust/ChangeLog:
* ast/rust-expr.h (struct AnonConst):
major refactoring of inline asm, mostly concerns
naming convention, trinary conditionals, warnings,
adding rust_unreachables in not-yet supported errors.
(struct InlineAsmRegOrRegClass): Likewise.
(struct InlineAsmOperand): Likewise.
* expand/rust-macro-builtins-asm.cc (parse_clobber_abi): Likewise.
(parse_reg): Likewise.
(parse_operand): Likewise.
(parse_reg_operand): Likewise.
(check_and_set): Likewise.
(parse_options): Likewise.
(parse_format_string): Likewise.
(parse_asm_arg): Likewise.
(parse_asm): Likewise.
* expand/rust-macro-builtins-asm.h (parse_asm_arg): Likewise.
(check_identifier): Likewise.
(check_and_set): Likewise.
(parse_operand): Likewise.
(parse_reg_operand): Likewise.
(parse_options): Likewise.
(parse_reg): Likewise.
(parse_clobber_abi): Likewise.
* expand/rust-macro-builtins.cc (enum class): Likewise.
(inline_asm_maker): Likewise.
* checks/errors/borrowck/ffi-polonius/Cargo.lock: Removed. Likewise.
gcc/testsuite/ChangeLog:
* rust/compile/inline_asm_faulty_clobber.rs: Likewise.
* rust/compile/inline_asm_faulty_clobber_1.rs: Likewise.
* rust/compile/inline_asm_faulty_clobber_2.rs: Likewise.
* rust/compile/inline_asm_illegal_options.rs: Likewise.
Diffstat (limited to 'gcc/rust/expand/rust-macro-builtins.cc')
| -rw-r--r-- | gcc/rust/expand/rust-macro-builtins.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 617202f..a6a3370 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -94,14 +94,14 @@ format_args_maker (AST::FormatArgs::Newline nl) enum class isGlobalAsm { - Yes, - No, + Global, + Inline, }; AST::MacroTranscriberFunc inline_asm_maker (isGlobalAsm is_global_asm) { - bool global_asm = is_global_asm == isGlobalAsm::Yes ? true : false; + bool global_asm = is_global_asm == isGlobalAsm::Global ? true : false; return [global_asm] (location_t loc, AST::MacroInvocData &invoc) { return MacroBuiltin::asm_handler (loc, invoc, global_asm); @@ -124,8 +124,8 @@ std::unordered_map<std::string, AST::MacroTranscriberFunc> {"include", MacroBuiltin::include_handler}, {"format_args", format_args_maker (AST::FormatArgs::Newline::No)}, {"format_args_nl", format_args_maker (AST::FormatArgs::Newline::Yes)}, - {"asm", inline_asm_maker (isGlobalAsm::No)}, - {"global_asm", inline_asm_maker (isGlobalAsm::Yes)}, + {"asm", inline_asm_maker (isGlobalAsm::Inline)}, + {"global_asm", inline_asm_maker (isGlobalAsm::Global)}, /* Unimplemented macro builtins */ {"option_env", MacroBuiltin::sorry}, {"concat_idents", MacroBuiltin::sorry}, |