Add ConstThreadState to mach_extensions.h and use it everywhere

util/mach/exc_server_variants.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // 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,
@@ skipping 258 matching lines @@
     //! request message is not complex (it does not carry the \a thread or \a
     //! task port rights) and thus there is nothing to destroy.
     //!
     //! \param[in] trailer The trailer received with the request message.
     virtual kern_return_t CatchExceptionRaiseState(
         exception_handler_t exception_port,
         exception_type_t exception,
         const typename Traits::ExceptionCode* code,
         mach_msg_type_number_t code_count,
         thread_state_flavor_t* flavor,
-        const natural_t* old_state,
+        ConstThreadState old_state,
         mach_msg_type_number_t old_state_count,
         thread_state_t new_state,
         mach_msg_type_number_t* new_state_count,
         const mach_msg_trailer_t* trailer) = 0;
 
     //! \brief Handles exceptions raised by `exception_raise_state_identity()`
     //!     or `mach_exception_raise_state_identity()`.
     //!
     //! This behaves equivalently to a `catch_exception_raise_state_identity()`
     //! function used with `exc_server()`, or a
     //! `catch_mach_exception_raise_state_identity()` function used with
     //! `mach_exc_server()`.
     //!
     //! \param[in] trailer The trailer received with the request message.
     //! \param[out] destroy_request `true` if the request message is to be
     //!     destroyed even when this method returns success. See
     //!     MachMessageServer::Interface.
     virtual kern_return_t CatchExceptionRaiseStateIdentity(
         exception_handler_t exception_port,
         thread_t thread,
         task_t task,
         exception_type_t exception,
         const typename Traits::ExceptionCode* code,
         mach_msg_type_number_t code_count,
         thread_state_flavor_t* flavor,
-        const natural_t* old_state,
+        ConstThreadState old_state,
         mach_msg_type_number_t old_state_count,
         thread_state_t new_state,
         mach_msg_type_number_t* new_state_count,
         const mach_msg_trailer_t* trailer,
         bool* destroy_request) = 0;
 
    protected:
     ~Interface() {}
   };
 
@@ skipping 200 matching lines @@
     //!     be ORed in to this parameter.
     virtual kern_return_t CatchException(
         exception_behavior_t behavior,
         exception_handler_t exception_port,
         thread_t thread,
         task_t task,
         exception_type_t exception,
         const typename Traits::ExceptionCode* code,
         mach_msg_type_number_t code_count,
         thread_state_flavor_t* flavor,
-        const natural_t* old_state,
+        ConstThreadState old_state,
         mach_msg_type_number_t old_state_count,
         thread_state_t new_state,
         mach_msg_type_number_t* new_state_count,
         const mach_msg_trailer_t* trailer,
         bool* destroy_complex_request) = 0;
 
    protected:
     ~Interface() {}
   };
 
@@ skipping 33 matching lines @@
         trailer,
         destroy_request);
   }
 
   kern_return_t CatchExceptionRaiseState(
       exception_handler_t exception_port,
       exception_type_t exception,
       const typename Traits::ExceptionCode* code,
       mach_msg_type_number_t code_count,
       thread_state_flavor_t* flavor,
-      const natural_t* old_state,
+      ConstThreadState old_state,
       mach_msg_type_number_t old_state_count,
       thread_state_t new_state,
       mach_msg_type_number_t* new_state_count,
       const mach_msg_trailer_t* trailer) override {
     bool destroy_complex_request = false;
     return interface_->CatchException(
         Traits::kExceptionBehavior | EXCEPTION_STATE,
         exception_port,
         THREAD_NULL,
         TASK_NULL,
@@ skipping 10 matching lines @@
   }
 
   kern_return_t CatchExceptionRaiseStateIdentity(
       exception_handler_t exception_port,
       thread_t thread,
       task_t task,
       exception_type_t exception,
       const typename Traits::ExceptionCode* code,
       mach_msg_type_number_t code_count,
       thread_state_flavor_t* flavor,
-      const natural_t* old_state,
+      ConstThreadState old_state,
       mach_msg_type_number_t old_state_count,
       thread_state_t new_state,
       mach_msg_type_number_t* new_state_count,
       const mach_msg_trailer_t* trailer,
       bool* destroy_request) override {
     return interface_->CatchException(
         Traits::kExceptionBehavior | EXCEPTION_STATE_IDENTITY,
         exception_port,
         thread,
         task,
@@ skipping 40 matching lines @@
 
   // SimplifiedExcServer<ExcTraits>::Interface:
   kern_return_t CatchException(exception_behavior_t behavior,
                                exception_handler_t exception_port,
                                thread_t thread,
                                task_t task,
                                exception_type_t exception,
                                const exception_data_type_t* code,
                                mach_msg_type_number_t code_count,
                                thread_state_flavor_t* flavor,
-                               const natural_t* old_state,
+                               ConstThreadState old_state,
                                mach_msg_type_number_t old_state_count,
                                thread_state_t new_state,
                                mach_msg_type_number_t* new_state_count,
                                const mach_msg_trailer_t* trailer,
                                bool* destroy_complex_request) {
     std::vector<mach_exception_data_type_t> mach_codes;
     mach_codes.reserve(code_count);
     for (size_t index = 0; index < code_count; ++index) {
       mach_codes.push_back(code[index]);
     }
@@ skipping 16 matching lines @@
 
   // SimplifiedExcServer<MachExcTraits>::Interface:
   kern_return_t CatchException(exception_behavior_t behavior,
                                exception_handler_t exception_port,
                                thread_t thread,
                                task_t task,
                                exception_type_t exception,
                                const mach_exception_data_type_t* code,
                                mach_msg_type_number_t code_count,
                                thread_state_flavor_t* flavor,
-                               const natural_t* old_state,
+                               ConstThreadState old_state,
                                mach_msg_type_number_t old_state_count,
                                thread_state_t new_state,
                                mach_msg_type_number_t* new_state_count,
                                const mach_msg_trailer_t* trailer,
                                bool* destroy_complex_request) {
     return interface_->CatchMachException(behavior,
                                           exception_port,
                                           thread,
                                           task,
                                           exception,
@@ skipping 77 matching lines @@
 kern_return_t ExcServerSuccessfulReturnValue(exception_behavior_t behavior,
                                              bool set_thread_state) {
   if (!set_thread_state && ExceptionBehaviorHasState(behavior)) {
     return MACH_RCV_PORT_DIED;
   }
 
   return KERN_SUCCESS;
 }
 
 void ExcServerCopyState(exception_behavior_t behavior,
-                        const natural_t* old_state,
+                        ConstThreadState old_state,
                         mach_msg_type_number_t old_state_count,
                         thread_state_t new_state,
                         mach_msg_type_number_t* new_state_count) {
   if (ExceptionBehaviorHasState(behavior)) {
     *new_state_count = std::min(old_state_count, *new_state_count);
     memcpy(new_state, old_state, *new_state_count * sizeof(old_state[0]));
   }
 }
 
 }  // namespace crashpad