mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git
				synced 2025-05-12 00:45:25 +00:00 
			
		
		
		
	Merge pull request #534 from neobrain/disassembler-improvements
Disassembler improvements
This commit is contained in:
		
						commit
						a45175ee0d
					
				@ -17,16 +17,9 @@
 | 
			
		||||
#include "core/arm/skyeye_common/armdefs.h"
 | 
			
		||||
#include "core/arm/disassembler/arm_disasm.h"
 | 
			
		||||
 | 
			
		||||
DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractItemModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
DisassemblerModel::DisassemblerModel(QObject* parent) : QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0), selection(QModelIndex()) {
 | 
			
		||||
 | 
			
		||||
QModelIndex DisassemblerModel::index(int row, int column, const QModelIndex& parent) const {
 | 
			
		||||
    return createIndex(row, column);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QModelIndex DisassemblerModel::parent(const QModelIndex& child) const {
 | 
			
		||||
    return QModelIndex();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int DisassemblerModel::columnCount(const QModelIndex& parent) const {
 | 
			
		||||
 | 
			
		||||
@ -2,8 +2,11 @@
 | 
			
		||||
// Licensed under GPLv2 or any later version
 | 
			
		||||
// Refer to the license.txt file included.
 | 
			
		||||
 | 
			
		||||
#include <QAbstractItemModel>
 | 
			
		||||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include <QAbstractListModel>
 | 
			
		||||
#include <QDockWidget>
 | 
			
		||||
 | 
			
		||||
#include "ui_disassembler.h"
 | 
			
		||||
 | 
			
		||||
#include "common/common.h"
 | 
			
		||||
@ -12,15 +15,13 @@
 | 
			
		||||
class QAction;
 | 
			
		||||
class EmuThread;
 | 
			
		||||
 | 
			
		||||
class DisassemblerModel : public QAbstractItemModel
 | 
			
		||||
class DisassemblerModel : public QAbstractListModel
 | 
			
		||||
{
 | 
			
		||||
    Q_OBJECT
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
    DisassemblerModel(QObject* parent);
 | 
			
		||||
 | 
			
		||||
    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
 | 
			
		||||
    QModelIndex parent(const QModelIndex& child) const override;
 | 
			
		||||
    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 | 
			
		||||
    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 | 
			
		||||
    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
 | 
			
		||||
 | 
			
		||||
@ -13,63 +13,66 @@
 | 
			
		||||
  <property name="windowTitle">
 | 
			
		||||
   <string>Disassembly</string>
 | 
			
		||||
  </property>
 | 
			
		||||
   <widget class="QWidget" name="dockWidgetContents">
 | 
			
		||||
     <layout class="QVBoxLayout" name="verticalLayout">
 | 
			
		||||
       <item>
 | 
			
		||||
         <layout class="QHBoxLayout" name="horizontalLayout">
 | 
			
		||||
           <item>
 | 
			
		||||
             <widget class="QPushButton" name="button_step">
 | 
			
		||||
               <property name="text">
 | 
			
		||||
                 <string>Step</string>
 | 
			
		||||
               </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
           </item>
 | 
			
		||||
           <item>
 | 
			
		||||
             <widget class="QPushButton" name="button_pause">
 | 
			
		||||
               <property name="text">
 | 
			
		||||
                 <string>Pause</string>
 | 
			
		||||
               </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
           </item>
 | 
			
		||||
           <item>
 | 
			
		||||
             <widget class="QPushButton" name="button_continue">
 | 
			
		||||
               <property name="text">
 | 
			
		||||
                 <string>Continue</string>
 | 
			
		||||
               </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
           </item>
 | 
			
		||||
           <item>
 | 
			
		||||
             <widget class="QPushButton" name="pushButton">
 | 
			
		||||
               <property name="text">
 | 
			
		||||
                 <string>Step Into</string>
 | 
			
		||||
               </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
           </item>
 | 
			
		||||
           <item>
 | 
			
		||||
             <widget class="QPushButton" name="button_breakpoint">
 | 
			
		||||
               <property name="text">
 | 
			
		||||
                 <string>Set Breakpoint</string>
 | 
			
		||||
               </property>
 | 
			
		||||
             </widget>
 | 
			
		||||
           </item>
 | 
			
		||||
         </layout>
 | 
			
		||||
       </item>
 | 
			
		||||
       <item>
 | 
			
		||||
         <widget class="QTreeView" name="treeView">
 | 
			
		||||
           <property name="alternatingRowColors">
 | 
			
		||||
             <bool>true</bool>
 | 
			
		||||
           </property>
 | 
			
		||||
           <property name="indentation">
 | 
			
		||||
             <number>20</number>
 | 
			
		||||
           </property>
 | 
			
		||||
           <property name="rootIsDecorated">
 | 
			
		||||
             <bool>false</bool>
 | 
			
		||||
           </property>
 | 
			
		||||
           <attribute name="headerVisible">
 | 
			
		||||
             <bool>false</bool>
 | 
			
		||||
           </attribute>
 | 
			
		||||
         </widget>
 | 
			
		||||
       </item>
 | 
			
		||||
  <widget class="QWidget" name="dockWidgetContents">
 | 
			
		||||
   <layout class="QVBoxLayout" name="verticalLayout">
 | 
			
		||||
    <item>
 | 
			
		||||
     <layout class="QHBoxLayout" name="horizontalLayout">
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QPushButton" name="button_step">
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>Step</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QPushButton" name="button_pause">
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>Pause</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QPushButton" name="button_continue">
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>Continue</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QPushButton" name="pushButton">
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>Step Into</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
      <item>
 | 
			
		||||
       <widget class="QPushButton" name="button_breakpoint">
 | 
			
		||||
        <property name="text">
 | 
			
		||||
         <string>Set Breakpoint</string>
 | 
			
		||||
        </property>
 | 
			
		||||
       </widget>
 | 
			
		||||
      </item>
 | 
			
		||||
     </layout>
 | 
			
		||||
    </item>
 | 
			
		||||
    <item>
 | 
			
		||||
     <widget class="QTreeView" name="treeView">
 | 
			
		||||
      <property name="alternatingRowColors">
 | 
			
		||||
       <bool>true</bool>
 | 
			
		||||
      </property>
 | 
			
		||||
      <property name="indentation">
 | 
			
		||||
       <number>20</number>
 | 
			
		||||
      </property>
 | 
			
		||||
      <property name="rootIsDecorated">
 | 
			
		||||
       <bool>false</bool>
 | 
			
		||||
      </property>
 | 
			
		||||
      <property name="uniformRowHeights">
 | 
			
		||||
       <bool>true</bool>
 | 
			
		||||
      </property>
 | 
			
		||||
      <attribute name="headerVisible">
 | 
			
		||||
       <bool>false</bool>
 | 
			
		||||
      </attribute>
 | 
			
		||||
     </widget>
 | 
			
		||||
    </item>
 | 
			
		||||
   </layout>
 | 
			
		||||
  </widget>
 | 
			
		||||
 </widget>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user