cp_annotate.cc (10377:434228c914e5) cp_annotate.cc (10470:2c6a72e919f6)
1/*
2 * Copyright (c) 2006-2009 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 808 unchanged lines hidden (view full) ---

817 CopyStringOut(tc, sm, args[1], 50);
818 doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc));
819 }
820}
821
822CPA::AnnDataPtr
823CPA::add(int t, int f, int c, int sm, int stq, int32_t d)
824{
1/*
2 * Copyright (c) 2006-2009 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;

--- 808 unchanged lines hidden (view full) ---

817 CopyStringOut(tc, sm, args[1], 50);
818 doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc));
819 }
820}
821
822CPA::AnnDataPtr
823CPA::add(int t, int f, int c, int sm, int stq, int32_t d)
824{
825 AnnDataPtr an = new AnnotateData;
825 AnnDataPtr an = std::make_shared<AnnotateData>();
826 an->time = curTick();
827 an->data = d;
828 an->orig_data = d;
829 an->op = t;
830 an->flag = f;
831 an->sm = sm;
832 an->stq = stq;
833 an->cpu = c;

--- 534 unchanged lines hidden (view full) ---

1368
1369
1370 // qData (vector<AnnotateList>)
1371 qData.resize(qSize.size());
1372 for (int x = 0; x < qSize.size(); x++) {
1373 if (!qSize[x])
1374 continue;
1375 for (int y = 0; y < qSize[x]; y++) {
826 an->time = curTick();
827 an->data = d;
828 an->orig_data = d;
829 an->op = t;
830 an->flag = f;
831 an->sm = sm;
832 an->stq = stq;
833 an->cpu = c;

--- 534 unchanged lines hidden (view full) ---

1368
1369
1370 // qData (vector<AnnotateList>)
1371 qData.resize(qSize.size());
1372 for (int x = 0; x < qSize.size(); x++) {
1373 if (!qSize[x])
1374 continue;
1375 for (int y = 0; y < qSize[x]; y++) {
1376 AnnDataPtr a = new AnnotateData;
1376 AnnDataPtr a = std::make_shared<AnnotateData>();
1377 a->unserialize(cp, csprintf("%s.Q%d_%d", section, x, y));
1378 data.push_back(a);
1379 qData[x].push_back(a);
1380 }
1381 }
1382}
1383
1384void

--- 31 unchanged lines hidden --- 		1377 a->unserialize(cp, csprintf("%s.Q%d_%d", section, x, y));
1378 data.push_back(a);
1379 qData[x].push_back(a);
1380 }
1381 }
1382}
1383
1384void

--- 31 unchanged lines hidden ---