Revision 5a834bb4 gdbstub.c

b/gdbstub.c
804 804
    /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
805 805
    switch (n) {
806 806
    case 64: GET_REGA(env->y);
807
    case 65: GET_REGA(GET_PSR(env));
807
    case 65: GET_REGA(cpu_get_psr(env));
808 808
    case 66: GET_REGA(env->wim);
809 809
    case 67: GET_REGA(env->tbr);
810 810
    case 68: GET_REGA(env->pc);
......
829 829
    switch (n) {
830 830
    case 80: GET_REGL(env->pc);
831 831
    case 81: GET_REGL(env->npc);
832
    case 82: GET_REGL(((uint64_t)GET_CCR(env) << 32) |
833
                           ((env->asi & 0xff) << 24) |
834
                           ((env->pstate & 0xfff) << 8) |
835
                           GET_CWP64(env));
832
    case 82: GET_REGL((cpu_get_ccr(env) << 32) |
833
                      ((env->asi & 0xff) << 24) |
834
                      ((env->pstate & 0xfff) << 8) |
835
                      cpu_get_cwp64(env));
836 836
    case 83: GET_REGL(env->fsr);
837 837
    case 84: GET_REGL(env->fprs);
838 838
    case 85: GET_REGL(env->y);
......
868 868
        /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
869 869
        switch (n) {
870 870
        case 64: env->y = tmp; break;
871
        case 65: PUT_PSR(env, tmp); break;
871
        case 65: cpu_put_psr(env, tmp); break;
872 872
        case 66: env->wim = tmp; break;
873 873
        case 67: env->tbr = tmp; break;
874 874
        case 68: env->pc = tmp; break;
......
892 892
        case 80: env->pc = tmp; break;
893 893
        case 81: env->npc = tmp; break;
894 894
        case 82:
895
	    PUT_CCR(env, tmp >> 32);
895
            cpu_put_ccr(env, tmp >> 32);
896 896
	    env->asi = (tmp >> 24) & 0xff;
897 897
	    env->pstate = (tmp >> 8) & 0xfff;
898
	    PUT_CWP64(env, tmp & 0xff);
898
            cpu_put_cwp64(env, tmp & 0xff);
899 899
	    break;
900 900
        case 83: env->fsr = tmp; break;
901 901
        case 84: env->fprs = tmp; break;

Also available in: Unified diff