[BACK]Return to ctrlxfer.c CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / i386c / ia32

Diff for /np2/i386c/ia32/ctrlxfer.c between versions 1.23 and 1.24

version 1.23, 2011/12/21 18:07:57 version 1.24, 2011/12/29 13:32:12
Line 33 Line 33
 /*------------------------------------------------------------------------------  /*------------------------------------------------------------------------------
  * JMPfar_pm   * JMPfar_pm
  */   */
 static void JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip);  static void CPUCALL JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip);
 static void JMPfar_pm_call_gate(const selector_t *callgate_sel);  static void CPUCALL JMPfar_pm_call_gate(const selector_t *callgate_sel);
 static void JMPfar_pm_task_gate(selector_t *taskgate_sel);  static void CPUCALL JMPfar_pm_task_gate(selector_t *taskgate_sel);
 static void JMPfar_pm_tss(selector_t *tss_sel);  static void CPUCALL JMPfar_pm_tss(selector_t *tss_sel);
   
 void  void CPUCALL
 JMPfar_pm(UINT16 selector, UINT32 new_ip)  JMPfar_pm(UINT16 selector, UINT32 new_ip)
 {  {
         selector_t jmp_sel;          selector_t jmp_sel;
Line 101  JMPfar_pm(UINT16 selector, UINT32 new_ip Line 101  JMPfar_pm(UINT16 selector, UINT32 new_ip
 /*---  /*---
  * JMPfar: code segment   * JMPfar: code segment
  */   */
 static void  static void CPUCALL
 JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip)  JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip)
 {  {
   
Line 147  JMPfar_pm_code_segment(const selector_t  Line 147  JMPfar_pm_code_segment(const selector_t 
 /*---  /*---
  * JMPfar: call gate   * JMPfar: call gate
  */   */
 static void  static void CPUCALL
 JMPfar_pm_call_gate(const selector_t *callgate_sel)  JMPfar_pm_call_gate(const selector_t *callgate_sel)
 {  {
         selector_t cs_sel;          selector_t cs_sel;
Line 226  JMPfar_pm_call_gate(const selector_t *ca Line 226  JMPfar_pm_call_gate(const selector_t *ca
 /*---  /*---
  * JMPfar: task gate   * JMPfar: task gate
  */   */
 static void  static void CPUCALL
 JMPfar_pm_task_gate(selector_t *taskgate_sel)  JMPfar_pm_task_gate(selector_t *taskgate_sel)
 {  {
         selector_t tss_sel;          selector_t tss_sel;
Line 291  JMPfar_pm_task_gate(selector_t *taskgate Line 291  JMPfar_pm_task_gate(selector_t *taskgate
 /*---  /*---
  * JMPfar: TSS   * JMPfar: TSS
  */   */
 static void  static void CPUCALL
 JMPfar_pm_tss(selector_t *tss_sel)  JMPfar_pm_tss(selector_t *tss_sel)
 {  {
   
Line 326  JMPfar_pm_tss(selector_t *tss_sel) Line 326  JMPfar_pm_tss(selector_t *tss_sel)
 /*------------------------------------------------------------------------------  /*------------------------------------------------------------------------------
  * CALLfar_pm   * CALLfar_pm
  */   */
 static void CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip);  static void CPUCALL CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip);
 static void CALLfar_pm_call_gate(const selector_t *callgate_sel);  static void CPUCALL CALLfar_pm_call_gate(const selector_t *callgate_sel);
 static void CALLfar_pm_task_gate(selector_t *taskgate_sel);  static void CPUCALL CALLfar_pm_task_gate(selector_t *taskgate_sel);
 static void CALLfar_pm_tss(selector_t *tss_sel);  static void CPUCALL CALLfar_pm_tss(selector_t *tss_sel);
   
 void  void CPUCALL
 CALLfar_pm(UINT16 selector, UINT32 new_ip)  CALLfar_pm(UINT16 selector, UINT32 new_ip)
 {  {
         selector_t call_sel;          selector_t call_sel;
Line 394  CALLfar_pm(UINT16 selector, UINT32 new_i Line 394  CALLfar_pm(UINT16 selector, UINT32 new_i
 /*---  /*---
  * CALLfar_pm: code segment   * CALLfar_pm: code segment
  */   */
 static void  static void CPUCALL
 CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip)  CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip)
 {  {
         UINT32 sp;          UINT32 sp;
Line 464  CALLfar_pm_code_segment(const selector_t Line 464  CALLfar_pm_code_segment(const selector_t
 /*---  /*---
  * CALLfar_pm: call gate   * CALLfar_pm: call gate
  */   */
 static void CALLfar_pm_call_gate_same_privilege(const selector_t *call_sel, selector_t *cs_sel);  static void CPUCALL CALLfar_pm_call_gate_same_privilege(const selector_t *call_sel, selector_t *cs_sel);
 static void CALLfar_pm_call_gate_more_privilege(const selector_t *call_sel, selector_t *cs_sel);  static void CPUCALL CALLfar_pm_call_gate_more_privilege(const selector_t *call_sel, selector_t *cs_sel);
   
 static void  static void CPUCALL
 CALLfar_pm_call_gate(const selector_t *callgate_sel)  CALLfar_pm_call_gate(const selector_t *callgate_sel)
 {  {
         selector_t cs_sel;          selector_t cs_sel;
Line 536  CALLfar_pm_call_gate(const selector_t *c Line 536  CALLfar_pm_call_gate(const selector_t *c
 /*---  /*---
  * CALLfar_pm: call gate (SAME-PRIVILEGE)   * CALLfar_pm: call gate (SAME-PRIVILEGE)
  */   */
 static void  static void CPUCALL
 CALLfar_pm_call_gate_same_privilege(const selector_t *callgate_sel, selector_t *cs_sel)  CALLfar_pm_call_gate_same_privilege(const selector_t *callgate_sel, selector_t *cs_sel)
 {  {
         UINT32 sp;          UINT32 sp;
Line 567  CALLfar_pm_call_gate_same_privilege(cons Line 567  CALLfar_pm_call_gate_same_privilege(cons
 /*---  /*---
  * CALLfar_pm: call gate (MORE-PRIVILEGE)   * CALLfar_pm: call gate (MORE-PRIVILEGE)
  */   */
 static void  static void CPUCALL
 CALLfar_pm_call_gate_more_privilege(const selector_t *callgate_sel, selector_t *cs_sel)  CALLfar_pm_call_gate_more_privilege(const selector_t *callgate_sel, selector_t *cs_sel)
 {  {
         UINT32 param[32];       /* copy param */          UINT32 param[32];       /* copy param */
Line 710  CALLfar_pm_call_gate_more_privilege(cons Line 710  CALLfar_pm_call_gate_more_privilege(cons
 /*---  /*---
  * CALLfar_pm: task gate   * CALLfar_pm: task gate
  */   */
 static void  static void CPUCALL
 CALLfar_pm_task_gate(selector_t *taskgate_sel)  CALLfar_pm_task_gate(selector_t *taskgate_sel)
 {  {
         selector_t tss_sel;          selector_t tss_sel;
Line 775  CALLfar_pm_task_gate(selector_t *taskgat Line 775  CALLfar_pm_task_gate(selector_t *taskgat
 /*---  /*---
  * CALLfar_pm: TSS   * CALLfar_pm: TSS
  */   */
 static void  static void CPUCALL
 CALLfar_pm_tss(selector_t *tss_sel)  CALLfar_pm_tss(selector_t *tss_sel)
 {  {
   
Line 811  CALLfar_pm_tss(selector_t *tss_sel) Line 811  CALLfar_pm_tss(selector_t *tss_sel)
  * RETfar_pm   * RETfar_pm
  */   */
   
 void  void CPUCALL
 RETfar_pm(UINT nbytes)  RETfar_pm(UINT nbytes)
 {  {
         selector_t cs_sel, ss_sel, temp_sel;          selector_t cs_sel, ss_sel, temp_sel;
Line 1012  RETfar_pm(UINT nbytes) Line 1012  RETfar_pm(UINT nbytes)
  * IRET_pm   * IRET_pm
  */   */
 static void IRET_pm_nested_task(void);  static void IRET_pm_nested_task(void);
 static void IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);  static void CPUCALL IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
 static void IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);  static void CPUCALL IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);
 static void IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);  static void CPUCALL IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags);
 static void IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);  static void CPUCALL IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
 static void IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);  static void CPUCALL IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags);
   
 void  void
 IRET_pm(void)  IRET_pm(void)
Line 1124  IRET_pm_nested_task(void) Line 1124  IRET_pm_nested_task(void)
 /*---  /*---
  * IRET_pm: PROTECTED-MODE-RETURN   * IRET_pm: PROTECTED-MODE-RETURN
  */   */
 static void  static void CPUCALL
 IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)  IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {  {
         selector_t cs_sel;          selector_t cs_sel;
Line 1175  IRET_pm_protected_mode_return(UINT16 new Line 1175  IRET_pm_protected_mode_return(UINT16 new
 /*---  /*---
  * IRET_pm: SAME-PRIVILEGE   * IRET_pm: SAME-PRIVILEGE
  */   */
 static void  static void CPUCALL
 IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)  IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)
 {  {
         UINT32 mask;          UINT32 mask;
Line 1223  IRET_pm_protected_mode_return_same_privi Line 1223  IRET_pm_protected_mode_return_same_privi
 /*---  /*---
  * IRET_pm: OUTER-PRIVILEGE   * IRET_pm: OUTER-PRIVILEGE
  */   */
 static void  static void CPUCALL
 IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)  IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags)
 {  {
         descriptor_t *sdp;          descriptor_t *sdp;
Line 1343  IRET_pm_protected_mode_return_outer_priv Line 1343  IRET_pm_protected_mode_return_outer_priv
 /*---  /*---
  * IRET_pm: new_flags & VM_FLAG   * IRET_pm: new_flags & VM_FLAG
  */   */
 static void  static void CPUCALL
 IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)  IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {  {
         UINT16 segsel[CPU_SEGREG_NUM];          UINT16 segsel[CPU_SEGREG_NUM];
Line 1390  IRET_pm_return_to_vm86(UINT16 new_cs, UI Line 1390  IRET_pm_return_to_vm86(UINT16 new_cs, UI
 /*---  /*---
  * IRET_pm: VM_FLAG   * IRET_pm: VM_FLAG
  */   */
 static void  static void CPUCALL
 IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)  IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags)
 {  {
         UINT stacksize;          UINT stacksize;
Removed from v.1.23  
changed lines
  Added in v.1.24

RetroPC.NET-CVS <cvs@retropc.net>