← Back to branch summary

~ppsspp/ppsspp/armips

« back to all changes in this revision

Viewing changes to Commands/CDirectiveConditional.h

  • Committer: Kingcom
  • Date: 2015-04-19 19:28:34 UTC
  • mfrom: (156.1.14)
  • Revision ID: git-v1:ae07e9d3cbe92357e48a48edf4787cf580d3525c
Merge branch 'ExpressionParser'

Show diffs side-by-side

added added

removed removed

Lines of Context:
Commands/CDirectiveConditional.h
1
1
#pragma once
2
2
#include "Util/CommonClasses.h"
3
3
#include "Commands/CAssemblerCommand.h"
4
 
#include "Core/MathParser.h"
 
4
#include "Core/Expression.h"
5
5
 
6
6
enum class ConditionType
7
7
{
28
28
        virtual bool IsConditional() { return true; };
29
29
private:
30
30
        void Execute();
31
 
        CExpressionCommandList Expression;
 
31
        Expression Expression;
32
32
        std::wstring labelName;
33
 
        int Value;
34
 
        int RamPos;
 
33
        u64 Value;
 
34
        u64 RamPos;
35
35
        ConditionType type;
36
36
};