--- Gnu-Mach/include/mach/memory_object.defs 2020/09/02 04:45:40 1.1.1.3 +++ Gnu-Mach/include/mach/memory_object.defs 2020/09/02 04:54:33 1.1.1.5 @@ -42,6 +42,10 @@ subsystem #include #include +#ifdef MEMORY_OBJECT_IMPORTS +MEMORY_OBJECT_IMPORTS +#endif + #if SEQNOS serverprefix seqnos_; serverdemux seqnos_memory_object_server; @@ -53,10 +57,10 @@ serverdemux seqnos_memory_object_server; * a name port that identifies this object to callers of * vm_regions. * [To allow the mapping of this object to be used, the - * memory manager must call memory_object_set_attributes, - * specifying the "ready" parameter as TRUE. To reject - * all mappings of this object, the memory manager may - * use memory_object_destroy.] + * memory manager must call memory_object_ready or + * memory_object_change_attributes. To reject all mappings of + * this object, the memory manager may use + * memory_object_destroy.] */ simpleroutine memory_object_init( memory_object : memory_object_t; @@ -72,11 +76,12 @@ simpleroutine memory_object_init( memory_object_page_size : vm_size_t); /* - * Indicates that the specified memory object is no longer - * mapped (or cached -- see memory_object_set_attributes), - * and that further mappings will cause another memory_object_init - * call to be made. No further calls will be made on - * the memory object by this kernel. + * Indicates that the specified memory object is no longer mapped + * (or cached -- see memory_object_ready or + * memory_object_change_attributes), and that further mappings + * will cause another memory_object_init call to be made. No + * further calls will be made on the memory object by this + * kernel. * * [All rights to the control and name ports are included * in this call. The memory manager should use port_deallocate @@ -85,7 +90,18 @@ simpleroutine memory_object_init( simpleroutine memory_object_terminate( memory_object : memory_object_t = MACH_MSG_TYPE_MOVE_SEND - ctype: mach_port_t; + ctype: mach_port_t +#ifdef MEMORY_OBJECT_INTRAN + intran: MEMORY_OBJECT_INTRAN +#endif +#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD + intranpayload: + MEMORY_OBJECT_INTRAN_PAYLOAD +#endif +#ifdef MEMORY_OBJECT_DESTRUCTOR + destructor: MEMORY_OBJECT_DESTRUCTOR +#endif + ; #if SEQNOS msgseqno seqno : mach_port_seqno_t; #endif /* SEQNOS */ @@ -129,8 +145,9 @@ simpleroutine memory_object_terminate( * call to indicate that the appropriate page of the original * memory object may be used to fulfill a data request. * - * [Reply should be memory_object_set_attributes on the - * new memory object control port to indicate readiness.] + * [Reply should be memory_object_ready or + * memory_object_change_attributes on the new memory object control + * port to indicate readiness.] */ simpleroutine memory_object_copy( old_memory_object : memory_object_t; @@ -156,7 +173,7 @@ simpleroutine memory_object_copy( * the specified data should be returned with at * least the specified access permitted. * - * [Reply should be memory_object_data_provided.] + * [Reply should be memory_object_data_supply.] */ simpleroutine memory_object_data_request( memory_object : memory_object_t; @@ -189,26 +206,7 @@ simpleroutine memory_object_data_unlock( length : vm_size_t; desired_access : vm_prot_t); -/* - * Write back modifications made to this portion of - * the memory object while in memory. - * - * Unless explicitly requested by a memory_object_lock_request - * (clean, but not flush), the kernel will not retain - * the data. - * - * [Reply should be vm_deallocate to release the data.] - */ -simpleroutine memory_object_data_write( - memory_object : memory_object_t; -#if SEQNOS - msgseqno seqno : mach_port_seqno_t; -#endif /* SEQNOS */ - memory_control : memory_object_control_t = - MACH_MSG_TYPE_MAKE_SEND - ctype: mach_port_t; - offset : vm_offset_t; - data : pointer_t); +skip; /* was: memory_object_data_write */ /* * Indicate that a previous memory_object_lock_reqeust has been @@ -221,7 +219,17 @@ simpleroutine memory_object_data_write( simpleroutine memory_object_lock_completed( memory_object : memory_object_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; + ctype: mach_port_t +#ifdef MEMORY_OBJECT_INTRAN + intran: MEMORY_OBJECT_INTRAN +#endif +#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD + intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD +#endif +#ifdef MEMORY_OBJECT_DESTRUCTOR + destructor: MEMORY_OBJECT_DESTRUCTOR +#endif + ; #if SEQNOS msgseqno seqno : mach_port_seqno_t; #endif /* SEQNOS */ @@ -252,7 +260,17 @@ simpleroutine memory_object_lock_complet simpleroutine memory_object_supply_completed( memory_object : memory_object_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; + ctype: mach_port_t +#ifdef MEMORY_OBJECT_INTRAN + intran: MEMORY_OBJECT_INTRAN +#endif +#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD + intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD +#endif +#ifdef MEMORY_OBJECT_DESTRUCTOR + destructor: MEMORY_OBJECT_DESTRUCTOR +#endif + ; #if SEQNOS msgseqno seqno : mach_port_seqno_t; #endif /* SEQNOS */ @@ -265,13 +283,12 @@ simpleroutine memory_object_supply_compl error_offset : vm_offset_t); /* - * Return data to manager. This call is used in place of data_write - * for objects initialized by object_ready instead of set_attributes. - * This call indicates whether the returned data is dirty and whether - * the kernel kept a copy. Precious data remains precious if the - * kernel keeps a copy. The indication that the kernel kept a copy - * is only a hint if the data is not precious; the cleaned copy may - * be discarded without further notifying the manager. + * Return data to manager. This call indicates whether the + * returned data is dirty and whether the kernel kept a copy. + * Precious data remains precious if the kernel keeps a copy. + * The indication that the kernel kept a copy is only a hint if + * the data is not precious; the cleaned copy may be discarded + * without further notifying the manager. * * [Reply should be vm_deallocate to release the data.] */ @@ -298,7 +315,17 @@ simpleroutine memory_object_data_retur simpleroutine memory_object_change_completed( memory_object : memory_object_t = polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE - ctype: mach_port_t; + ctype: mach_port_t +#ifdef MEMORY_OBJECT_INTRAN + intran: MEMORY_OBJECT_INTRAN +#endif +#ifdef MEMORY_OBJECT_INTRAN_PAYLOAD + intranpayload: MEMORY_OBJECT_INTRAN_PAYLOAD +#endif +#ifdef MEMORY_OBJECT_DESTRUCTOR + destructor: MEMORY_OBJECT_DESTRUCTOR +#endif + ; #if SEQNOS msgseqno seqno : mach_port_seqno_t; #endif /* SEQNOS */